diff -Nru apt-0.8.13.2ubuntu2/apt-pkg/acquire-item.cc apt-0.8.13.2ubuntu4.1/apt-pkg/acquire-item.cc --- apt-0.8.13.2ubuntu2/apt-pkg/acquire-item.cc 2011-04-05 08:19:07.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/apt-pkg/acquire-item.cc 2011-06-21 16:11:32.000000000 +0000 @@ -271,6 +271,14 @@ string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI); + /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #627642) */ + indexRecords SubIndexParser; + if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) { + Status = StatError; + ErrorText = SubIndexParser.ErrorText; + return; + } + // sucess in downloading the index // rename the index if(Debug) @@ -894,6 +902,30 @@ ReportMirrorFailure("HashChecksumFailure"); return; } + + /* Verify the index file for correctness (all indexes must + * have a Package field) (LP: #346386) (Closes: #627642) */ + { + FileFd fd(DestFile, FileFd::ReadOnly); + pkgTagSection sec; + pkgTagFile tag(&fd); + + // Only test for correctness if the file is not empty (empty is ok) + if (fd.Size() > 0) { + if (_error->PendingError() || !tag.Step(sec)) { + Status = StatError; + _error->DumpErrors(); + Rename(DestFile,DestFile + ".FAILED"); + return; + } else if (!sec.Exists("Package")) { + Status = StatError; + ErrorText = ("Encountered a section with no Package: header"); + Rename(DestFile,DestFile + ".FAILED"); + return; + } + } + } + // Done, move it into position string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); @@ -1330,6 +1362,16 @@ /*}}}*/ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ { +#if 0 + /* Reject invalid, existing Release files (LP: #346386) (Closes: #627642) + * FIXME: Disabled; it breaks unsigned repositories without hashes */ + if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile)) + { + Status = StatError; + ErrorText = MetaIndexParser->ErrorText; + return; + } +#endif for (vector ::const_iterator Target = IndexTargets->begin(); Target != IndexTargets->end(); Target++) @@ -1493,6 +1535,12 @@ LookupTag(Message,"Message").c_str()); RunScripts("APT::Update::Auth-Failure"); return; + } 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()); + return; } else { _error->Warning(_("GPG error: %s: %s"), Desc.Description.c_str(), diff -Nru apt-0.8.13.2ubuntu2/apt-pkg/deb/dpkgpm.cc apt-0.8.13.2ubuntu4.1/apt-pkg/deb/dpkgpm.cc --- apt-0.8.13.2ubuntu2/apt-pkg/deb/dpkgpm.cc 2011-04-05 08:19:07.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/apt-pkg/deb/dpkgpm.cc 2011-06-21 16:11:32.000000000 +0000 @@ -1324,18 +1324,24 @@ // do not report dpkg I/O errors, this is a format string, so we compare // the prefix and the suffix of the error with the dpkg error message - const char *short_read_error = dgettext("dpkg", "short read in buffer_copy %s"); - vector list = VectorizeString(short_read_error, '%'); - if (list.size() > 1) + vector io_errors; + io_errors.push_back(string("failed to read on buffer copy for %s")); + io_errors.push_back(string("failed in write on buffer copy for %s")); + io_errors.push_back(string("short read on buffer copy for %s")); + + for (vector::iterator I = io_errors.begin(); I != io_errors.end(); I++) { - // we need to split %s, VectorizeString only allows char so we need - // to kill the "s" manually - if (list[1].size() > 1) { - list[1].erase(0, 1); - if(strstr(errormsg, list[0].c_str()) && - strstr(errormsg, list[1].c_str())) { - std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; - return; + vector list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%'); + if (list.size() > 1) { + // we need to split %s, VectorizeString only allows char so we need + // to kill the "s" manually + if (list[1].size() > 1) { + list[1].erase(0, 1); + if(strstr(errormsg, list[0].c_str()) && + strstr(errormsg, list[1].c_str())) { + std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + return; + } } } } diff -Nru apt-0.8.13.2ubuntu2/apt-pkg/indexcopy.cc apt-0.8.13.2ubuntu4.1/apt-pkg/indexcopy.cc --- apt-0.8.13.2ubuntu2/apt-pkg/indexcopy.cc 2011-04-07 10:50:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/apt-pkg/indexcopy.cc 2011-07-07 12:20:11.000000000 +0000 @@ -664,6 +664,21 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, int const &statusfd, int fd[2]) { + if (File == FileGPG) + { + #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n" + char buffer[sizeof(SIGMSG)]; + FILE* gpg = fopen(File.c_str(), "r"); + if (gpg == NULL) + return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str()); + char const * const test = fgets(buffer, sizeof(buffer), gpg); + fclose(gpg); + if (test == NULL || strcmp(buffer, SIGMSG) != 0) + return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str()); + #undef SIGMSG + } + + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); // FIXME: remove support for deprecated APT::GPGV setting string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted")); @@ -688,7 +703,11 @@ Args.reserve(30); if (keyrings.empty() == true) - return false; + { + // TRANSLATOR: %s is the trusted keyring parts directory + return _error->Error(_("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts").c_str()); + } Args.push_back(gpgvpath.c_str()); Args.push_back("--ignore-time-conflict"); diff -Nru apt-0.8.13.2ubuntu2/autom4te.cache/output.0 apt-0.8.13.2ubuntu4.1/autom4te.cache/output.0 --- apt-0.8.13.2ubuntu2/autom4te.cache/output.0 2011-04-07 10:52:31.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/autom4te.cache/output.0 2011-06-21 16:11:32.000000000 +0000 @@ -2457,7 +2457,7 @@ cat >>confdefs.h <<_ACEOF -@%:@define VERSION "0.8.13.2ubuntu2" +@%:@define VERSION "0.8.13.2ubuntu3" _ACEOF PACKAGE="apt" diff -Nru apt-0.8.13.2ubuntu2/autom4te.cache/output.1 apt-0.8.13.2ubuntu4.1/autom4te.cache/output.1 --- apt-0.8.13.2ubuntu2/autom4te.cache/output.1 2011-04-07 10:52:31.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/autom4te.cache/output.1 2011-07-07 12:27:52.000000000 +0000 @@ -2457,7 +2457,7 @@ cat >>confdefs.h <<_ACEOF -@%:@define VERSION "0.8.13.2ubuntu2" +@%:@define VERSION "0.8.13.2ubuntu4.1" _ACEOF PACKAGE="apt" diff -Nru apt-0.8.13.2ubuntu2/configure apt-0.8.13.2ubuntu4.1/configure --- apt-0.8.13.2ubuntu2/configure 2011-04-07 10:52:32.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/configure 2011-07-07 12:27:52.000000000 +0000 @@ -2457,7 +2457,7 @@ cat >>confdefs.h <<_ACEOF -#define VERSION "0.8.13.2ubuntu2" +#define VERSION "0.8.13.2ubuntu4.1" _ACEOF PACKAGE="apt" diff -Nru apt-0.8.13.2ubuntu2/configure.in apt-0.8.13.2ubuntu4.1/configure.in --- apt-0.8.13.2ubuntu2/configure.in 2011-04-07 10:52:30.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/configure.in 2011-07-07 12:27:51.000000000 +0000 @@ -18,7 +18,7 @@ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.8.13.2ubuntu2") +AC_DEFINE_UNQUOTED(VERSION,"0.8.13.2ubuntu4.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff -Nru apt-0.8.13.2ubuntu2/debian/changelog apt-0.8.13.2ubuntu4.1/debian/changelog --- apt-0.8.13.2ubuntu2/debian/changelog 2011-04-07 10:52:26.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/debian/changelog 2011-07-07 12:24:14.000000000 +0000 @@ -1,3 +1,35 @@ +apt (0.8.13.2ubuntu4.1) natty-security; urgency=low + + * SECURITY UPDATE: incorrect InRelease file signature validation + (LP: #784473) + - apt-pkg/indexcopy.cc, methods/gpgv.cc: Ensure file starts with + clearsigned message header. + - patch thanks to David Kalnischkies. + - CVE-2011-1829 + + -- Marc Deslauriers Thu, 07 Jul 2011 08:20:46 -0400 + +apt (0.8.13.2ubuntu4) natty-proposed; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - do not reject empty Packages files when checking them for + correctness + + -- Brian Murray Fri, 10 Jun 2011 12:05:03 -0700 + +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - stop reporting of apport-package bug reports regarding + dpkg I/O errors (LP: #767776) + + -- Brian Murray Wed, 20 Apr 2011 15:05:12 -0700 + apt (0.8.13.2ubuntu2) natty; urgency=low [ Michael Vogt ] diff -Nru apt-0.8.13.2ubuntu2/methods/gpgv.cc apt-0.8.13.2ubuntu4.1/methods/gpgv.cc --- apt-0.8.13.2ubuntu2/methods/gpgv.cc 2010-08-24 19:38:50.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/methods/gpgv.cc 2011-07-07 12:20:11.000000000 +0000 @@ -65,13 +65,16 @@ return string("Couldn't spawn new process") + strerror(errno); else if (pid == 0) { - if (SigVerify::RunGPGV(outfile, file, 3, fd) == false) - { - // TRANSLATOR: %s is the trusted keyring parts directory - ioprintf(ret, _("No keyring installed in %s."), - _config->FindDir("Dir::Etc::TrustedParts").c_str()); - return ret.str(); + _error->PushToStack(); + bool const success = SigVerify::RunGPGV(outfile, file, 3, fd); + if (success == false) + { + string errmsg; + _error->PopMessage(errmsg); + _error->RevertToStack(); + return errmsg; } + _error->RevertToStack(); exit(111); } close(fd[1]); diff -Nru apt-0.8.13.2ubuntu2/po/apt-all.pot apt-0.8.13.2ubuntu4.1/po/apt-all.pot --- apt-0.8.13.2ubuntu2/po/apt-all.pot 2011-04-07 10:52:38.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/apt-all.pot 2011-07-07 12:28:00.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1864,34 +1864,28 @@ msgid "Unable to connect to %s:%s:" msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2237,7 +2231,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "" @@ -2693,77 +2687,78 @@ msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, 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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "" @@ -2880,22 +2875,22 @@ msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2915,6 +2910,17 @@ msgid "Hash mismatch for: %s" msgstr "" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3078,14 +3084,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ar.po apt-0.8.13.2ubuntu4.1/po/ar.po --- apt-0.8.13.2ubuntu2/po/ar.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ar.po 2011-07-07 12:28:00.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -1890,34 +1890,28 @@ msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "إجهاض التثبيت." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2266,7 +2260,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "" @@ -2723,78 +2717,79 @@ msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, 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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2914,22 +2909,22 @@ msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2949,6 +2944,17 @@ msgid "Hash mismatch for: %s" msgstr "MD5Sum غير متطابقة" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "إجهاض التثبيت." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3112,14 +3118,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ast.po apt-0.8.13.2ubuntu4.1/po/ast.po --- apt-0.8.13.2ubuntu2/po/ast.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ast.po 2011-07-07 12:28:00.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -2082,35 +2082,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "L'aniellu de claves nun s'instaló en %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2466,7 +2460,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "El subprocesu %s terminó de manera inesperada" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nun se pudo abrir el ficheru %s" @@ -2941,45 +2935,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "falló'l cambiu de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "La suma MD5 nun concasa" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "El ficheru release espiró, inorando %s (nun válidu dende %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2988,12 +2982,13 @@ "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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3002,7 +2997,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3011,7 +3006,7 @@ "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3019,7 +3014,7 @@ "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "El tamañu nun concasa" @@ -3144,22 +3139,22 @@ 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/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i rexistros escritos.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3181,6 +3176,17 @@ msgid "Hash mismatch for: %s" msgstr "El hash nun concasa pa: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "L'aniellu de claves nun s'instaló en %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3360,14 +3366,7 @@ "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/bg.po apt-0.8.13.2ubuntu4.1/po/bg.po --- apt-0.8.13.2ubuntu2/po/bg.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/bg.po 2011-07-07 12:28:00.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-27 22:33+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -2100,38 +2100,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "В %s няма инсталиран ключодържател." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е " "gpgv?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2490,7 +2484,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" @@ -2978,45 +2972,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неуспех при анализиране на файл Release %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Файлът %s вече не е валиден и ще бъде игнориран. (изтекъл е преди %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3025,12 +3019,13 @@ "Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се " "използват старите индексни файлове. Грешка от GPG: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3039,7 +3034,7 @@ "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3048,14 +3043,14 @@ "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -3180,22 +3175,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записани са %i записа с %i липсващи файла.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" @@ -3215,6 +3210,17 @@ msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума за: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "В %s няма инсталиран ключодържател." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3396,14 +3402,7 @@ "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/bs.po apt-0.8.13.2ubuntu4.1/po/bs.po --- apt-0.8.13.2ubuntu2/po/bs.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/bs.po 2011-07-07 12:28:00.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -1886,35 +1886,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Odustajem od instalacije." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2263,7 +2257,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "" @@ -2721,77 +2715,78 @@ msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, 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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "" @@ -2911,22 +2906,22 @@ msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2946,6 +2941,17 @@ msgid "Hash mismatch for: %s" msgstr "" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Odustajem od instalacije." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3109,14 +3115,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ca.po apt-0.8.13.2ubuntu4.1/po/ca.po --- apt-0.8.13.2ubuntu2/po/ca.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ca.po 2011-07-07 12:28:00.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt 0.7.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-09-02 11:51+0100\n" "Last-Translator: Agustí Grau \n" "Language-Team: Catalan \n" @@ -2098,38 +2098,32 @@ msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "No s'ha instal·lat cap clauer a %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar 'gpgv' per a verificar la firma (està instal·lat el " "gpgv?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2487,7 +2481,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" @@ -2972,45 +2966,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No es pot analitzar el fitxer Release %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "El fitxer Release ha caducat, s'està ignorant %s (invàlid des de %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3020,12 +3014,13 @@ "està actualitzat i serà utilitzat el fitxer d'índex anterior. error GPG: %s: " "%s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3035,7 +3030,7 @@ "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3044,7 +3039,7 @@ "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3052,7 +3047,7 @@ "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "La mida no concorda" @@ -3177,22 +3172,22 @@ 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/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3214,6 +3209,17 @@ msgid "Hash mismatch for: %s" msgstr "El resum no coincideix per a: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "No s'ha instal·lat cap clauer a %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3395,14 +3401,7 @@ "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/cs.po apt-0.8.13.2ubuntu4.1/po/cs.po --- apt-0.8.13.2ubuntu2/po/cs.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/cs.po 2011-07-07 12:28:00.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-11-27 13:54+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -2069,34 +2069,28 @@ msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "V %s není nainstalována žádná klíčenka." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2451,7 +2445,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nelze otevřít soubor %s" @@ -2920,45 +2914,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nelze zpracovat Release soubor %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Souboru Release vypršela platnost, ignoruji %s (neplatný již %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2967,12 +2961,13 @@ "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" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2981,7 +2976,7 @@ "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2990,14 +2985,14 @@ "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -3122,22 +3117,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsáno %i záznamů.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3157,6 +3152,17 @@ msgid "Hash mismatch for: %s" msgstr "Neshoda kontrolních součtů pro: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "V %s není nainstalována žádná klíčenka." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3329,14 +3335,7 @@ "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/cy.po apt-0.8.13.2ubuntu4.1/po/cy.po --- apt-0.8.13.2ubuntu2/po/cy.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/cy.po 2011-07-07 12:28:00.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -2126,35 +2126,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Yn Erthylu'r Sefydliad." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2515,7 +2509,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" @@ -3006,17 +3000,17 @@ msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3024,42 +3018,43 @@ msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3068,7 +3063,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3077,14 +3072,14 @@ "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -3207,22 +3202,22 @@ msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3242,6 +3237,17 @@ msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3405,14 +3411,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/da.po apt-0.8.13.2ubuntu4.1/po/da.po --- apt-0.8.13.2ubuntu2/po/da.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/da.po 2011-07-07 12:28:00.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-09-01 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -2084,36 +2084,30 @@ msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Ingen nøglering installeret i %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2468,7 +2462,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" @@ -2941,28 +2935,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hashsum stemmer ikke" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke fortolke udgivelsesfil %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" @@ -2970,17 +2964,17 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Udgivelsesfil udløbet, ignorerer %s (ugyldig siden %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2989,12 +2983,13 @@ "Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret " "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3003,7 +2998,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3012,13 +3007,13 @@ "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@ -3143,22 +3138,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3178,6 +3173,17 @@ msgid "Hash mismatch for: %s" msgstr "Hashsum stemmer ikke: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Ingen nøglering installeret i %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3351,14 +3357,7 @@ "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 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 -Nru apt-0.8.13.2ubuntu2/po/de.po apt-0.8.13.2ubuntu4.1/po/de.po --- apt-0.8.13.2ubuntu2/po/de.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/de.po 2011-07-07 12:28:00.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt 0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-11-15 21:42+0100\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -2128,38 +2128,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Kein Schlüsselring in %s installiert." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv " "installiert?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2521,7 +2515,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Datei %s konnte nicht geöffnet werden" @@ -3015,28 +3009,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release-Datei %s kann nicht verarbeitet werden" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" @@ -3044,17 +3038,17 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Release-Datei abgelaufen, %s wird ignoriert (ungültig seit %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3064,12 +3058,13 @@ "wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. " "GPG-Fehler: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3078,7 +3073,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3087,14 +3082,14 @@ "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " "Sie dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" @@ -3219,22 +3214,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3256,6 +3251,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash-Summe stimmt nicht überein für: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Kein Schlüsselring in %s installiert." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3439,14 +3445,7 @@ "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/dz.po apt-0.8.13.2ubuntu4.1/po/dz.po --- apt-0.8.13.2ubuntu2/po/dz.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/dz.po 2011-07-07 12:28:00.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -2078,38 +2078,32 @@ msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2460,7 +2454,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" @@ -2930,58 +2924,59 @@ msgid "rename failed, %s (%s -> %s)." msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2990,7 +2985,7 @@ " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2999,14 +2994,14 @@ " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -3128,22 +3123,22 @@ msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3165,6 +3160,17 @@ msgid "Hash mismatch for: %s" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3328,14 +3334,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/el.po apt-0.8.13.2ubuntu4.1/po/el.po --- apt-0.8.13.2ubuntu2/po/el.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/el.po 2011-07-07 12:28:00.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: quad-nrg.net \n" "Language-Team: Greek \n" @@ -2099,39 +2099,33 @@ msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Εγκατάλειψη της εγκατάστασης." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι " "εγκατεστημένο το gpgv;)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2489,7 +2483,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" @@ -2965,57 +2959,58 @@ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3024,7 +3019,7 @@ "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3033,7 +3028,7 @@ "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3041,7 +3036,7 @@ "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -3164,22 +3159,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" @@ -3199,6 +3194,17 @@ msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Εγκατάλειψη της εγκατάστασης." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3364,14 +3370,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/es.po apt-0.8.13.2ubuntu4.1/po/es.po --- apt-0.8.13.2ubuntu2/po/es.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/es.po 2011-07-07 12:28:00.000000000 +0000 @@ -33,7 +33,7 @@ msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -2161,37 +2161,31 @@ msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "No se instaló ningún anillo de claves %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2551,7 +2545,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s terminó de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" @@ -3039,28 +3033,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " @@ -3069,18 +3063,18 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" "El archivo «Release» ha expirado, ignorando %s (inválido desde hace %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3090,12 +3084,13 @@ "está actualizado y se utilizarán los ficheros de índice antiguos. El error " "GPG es: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3105,7 +3100,7 @@ "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3114,7 +3109,7 @@ "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3122,7 +3117,7 @@ "Los archivos de índice de paquetes están dañados. No existe un campo " "«Filename:» para el paquete %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "El tamaño difiere" @@ -3247,22 +3242,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3283,6 +3278,17 @@ msgid "Hash mismatch for: %s" msgstr "La suma hash difiere para: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "No se instaló ningún anillo de claves %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3466,14 +3472,7 @@ "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/eu.po apt-0.8.13.2ubuntu4.1/po/eu.po --- apt-0.8.13.2ubuntu2/po/eu.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/eu.po 2011-07-07 12:28:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -2076,35 +2076,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Abortatu instalazioa." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2460,7 +2454,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" @@ -2926,57 +2920,58 @@ msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2985,7 +2980,7 @@ "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2994,7 +2989,7 @@ "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3002,7 +2997,7 @@ "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -3125,22 +3120,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3161,6 +3156,17 @@ msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortatu instalazioa." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3326,14 +3332,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/fi.po apt-0.8.13.2ubuntu4.1/po/fi.po --- apt-0.8.13.2ubuntu2/po/fi.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/fi.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -2072,37 +2072,31 @@ msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Asennus keskeytetään." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2452,7 +2446,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" @@ -2918,57 +2912,58 @@ msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash Sum täsmää" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2977,7 +2972,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2986,7 +2981,7 @@ "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2994,7 +2989,7 @@ "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -3117,22 +3112,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3154,6 +3149,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash Sum täsmää" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Asennus keskeytetään." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3319,14 +3325,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/fr.po apt-0.8.13.2ubuntu4.1/po/fr.po --- apt-0.8.13.2ubuntu2/po/fr.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/fr.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2011-02-16 07:44+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -2129,38 +2129,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Pas de porte-clés installé dans %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 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é)." -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2527,7 +2521,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Impossible d'ouvrir le fichier %s" @@ -3030,16 +3024,16 @@ msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3048,13 +3042,13 @@ "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:1361 +#: apt-pkg/acquire-item.cc:1403 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" @@ -3062,17 +3056,17 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Le fichier Release a expiré, %s ignoré (non valable depuis %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3082,12 +3076,13 @@ "pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de " "GPG : %s : %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3096,7 +3091,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3105,7 +3100,7 @@ "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3113,7 +3108,7 @@ "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Taille incohérente" @@ -3238,22 +3233,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3275,6 +3270,17 @@ msgid "Hash mismatch for: %s" msgstr "Somme de contrôle de hachage incohérente pour %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Pas de porte-clés installé dans %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3456,14 +3462,7 @@ "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/gl.po apt-0.8.13.2ubuntu4.1/po/gl.po --- apt-0.8.13.2ubuntu2/po/gl.po 2011-04-07 10:52:39.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/gl.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-12-17 22:44+0100\n" "Last-Translator: mvillarino \n" "Language-Team: galician \n" @@ -2087,39 +2087,33 @@ msgid "Unable to connect to %s:%s:" msgstr "Non se pode conectar a %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "A abortar a instalación." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non se puido determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Atopouse alomenos unha sinatura non válida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv " "instalado?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran válidas:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2470,7 +2464,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" @@ -2939,28 +2933,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Os \"hashes\" non coinciden" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" @@ -2968,29 +2962,30 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2999,7 +2994,7 @@ "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3008,7 +3003,7 @@ "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3016,7 +3011,7 @@ "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -3139,22 +3134,22 @@ msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de fontes deste disco son:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Graváronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3176,6 +3171,17 @@ msgid "Hash mismatch for: %s" msgstr "Os \"hashes\" non coinciden" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "A abortar a instalación." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3341,14 +3347,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/hu.po apt-0.8.13.2ubuntu4.1/po/hu.po --- apt-0.8.13.2ubuntu2/po/hu.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/hu.po 2011-07-07 12:28:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-05-11 14:49+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@ -2060,35 +2060,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Sikertelen kapcsolódás ide: %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Telepítés megszakítása." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2440,7 +2434,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" @@ -2913,57 +2907,58 @@ msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2972,7 +2967,7 @@ "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2981,14 +2976,14 @@ "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -3111,22 +3106,22 @@ msgid "Source list entries for this disc are:\n" msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i hibásan párosított fájllal\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" @@ -3146,6 +3141,17 @@ msgid "Hash mismatch for: %s" msgstr "A Hash Sum nem megfelelő" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Telepítés megszakítása." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3309,14 +3315,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/it.po apt-0.8.13.2ubuntu4.1/po/it.po --- apt-0.8.13.2ubuntu2/po/it.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/it.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2011-02-21 18:35+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -2111,38 +2111,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Nessun portachiavi installato in %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è " "installato)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2510,7 +2504,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s è uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" @@ -3005,16 +2999,16 @@ msgid "rename failed, %s (%s -> %s)." msgstr "rename() non riuscita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5sum non corrispondente" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Somma hash non corrispondente" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3023,12 +3017,12 @@ "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" @@ -3036,17 +3030,17 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "File Release scaduto, %s viene ignorato (non valido da %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3055,12 +3049,13 @@ "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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3069,7 +3064,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3079,7 +3074,7 @@ "sistemare manualmente questo pacchetto." # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3087,7 +3082,7 @@ "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" " "per il pacchetto %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Le dimensioni non corrispondono" @@ -3212,22 +3207,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3248,6 +3243,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash non corrispondente per %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Nessun portachiavi installato in %s." + # (ndt) dovrebbe essere inteso il file Release #: apt-pkg/cacheset.cc:337 #, c-format @@ -3433,14 +3439,7 @@ "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ja.po apt-0.8.13.2ubuntu4.1/po/ja.po --- apt-0.8.13.2ubuntu2/po/ja.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ja.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-25 09:33+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -2097,36 +2097,30 @@ msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "%s にキーリングがインストールされていません。" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ" "ていますか?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2477,7 +2471,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" @@ -2959,48 +2953,48 @@ msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル %s を解釈することができません" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" "Release ファイルが期限切れになっているので、%s を無視します (%s 以来無効)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3009,12 +3003,13 @@ "署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデックス" "ファイルが使われます。GPG エラー: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3023,7 +3018,7 @@ "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3032,7 +3027,7 @@ "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3040,7 +3035,7 @@ "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -3165,22 +3160,22 @@ msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3202,6 +3197,17 @@ msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s にキーリングがインストールされていません。" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3378,14 +3384,7 @@ "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/km.po apt-0.8.13.2ubuntu4.1/po/km.po --- apt-0.8.13.2ubuntu2/po/km.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/km.po 2011-07-07 12:28:01.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -2051,35 +2051,29 @@ msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2428,7 +2422,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" @@ -2893,58 +2887,59 @@ msgid "rename failed, %s (%s -> %s)." msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2953,7 +2948,7 @@ "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2961,13 +2956,13 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -3089,22 +3084,22 @@ msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" @@ -3124,6 +3119,17 @@ msgid "Hash mismatch for: %s" msgstr "MD5Sum មិន​ផ្គួផ្គង​" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3287,14 +3293,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ko.po apt-0.8.13.2ubuntu4.1/po/ko.po --- apt-0.8.13.2ubuntu2/po/ko.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ko.po 2011-07-07 12:28:01.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -2066,35 +2066,29 @@ msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "%s에 키 모음을 설치하지 않았습니다." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2443,7 +2437,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" @@ -2914,45 +2908,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "해시 합이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Release 파일이 만료되었습니다. %s 무시. (%s 이후로 무효)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2961,12 +2955,13 @@ "디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2975,7 +2970,7 @@ "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2984,14 +2979,14 @@ "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -3114,22 +3109,22 @@ msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" @@ -3149,6 +3144,17 @@ msgid "Hash mismatch for: %s" msgstr "다음의 해시가 다릅니다: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s에 키 모음을 설치하지 않았습니다." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3318,14 +3324,7 @@ "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ku.po apt-0.8.13.2ubuntu4.1/po/ku.po --- apt-0.8.13.2ubuntu2/po/ku.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ku.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -1890,35 +1890,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Sazkirin tê betalkirin." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2268,7 +2262,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" @@ -2724,77 +2718,78 @@ msgid "rename failed, %s (%s -> %s)." msgstr "nav guherandin biserneket, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, 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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" @@ -2913,22 +2908,22 @@ msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i tomar hatin nivîsîn.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2948,6 +2943,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Sazkirin tê betalkirin." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3111,14 +3117,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/lt.po apt-0.8.13.2ubuntu4.1/po/lt.po --- apt-0.8.13.2ubuntu2/po/lt.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/lt.po 2011-07-07 12:28:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -1984,34 +1984,28 @@ msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Diegimas nutraukiamas." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2360,7 +2354,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nepavyko atverti failo %s" @@ -2821,77 +2815,78 @@ msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5 sumos neatitikimas" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, 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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Neatitinka dydžiai" @@ -3010,22 +3005,22 @@ msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3045,6 +3040,17 @@ msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Diegimas nutraukiamas." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3208,14 +3214,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/mr.po apt-0.8.13.2ubuntu4.1/po/mr.po --- apt-0.8.13.2ubuntu2/po/mr.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/mr.po 2011-07-07 12:28:01.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -2055,36 +2055,30 @@ msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "संस्थापन खंडित करत आहे." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2432,7 +2426,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" @@ -2902,57 +2896,58 @@ msgid "rename failed, %s (%s -> %s)." msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2961,7 +2956,7 @@ "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2970,7 +2965,7 @@ "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2978,7 +2973,7 @@ "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -3101,22 +3096,22 @@ msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i माहितीसंच लिहिले.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" @@ -3136,6 +3131,17 @@ msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "संस्थापन खंडित करत आहे." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3299,14 +3305,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/nb.po apt-0.8.13.2ubuntu4.1/po/nb.po --- apt-0.8.13.2ubuntu2/po/nb.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/nb.po 2011-07-07 12:28:01.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -2087,35 +2087,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Ingen nøkkelring installert i %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2469,7 +2463,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Klarte ikke åpne fila %s" @@ -2940,28 +2934,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" @@ -2969,17 +2963,17 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Utgavefil har utgått, ignorerer %s (ugyldg siden %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2988,12 +2982,13 @@ "En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den " "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3002,7 +2997,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3011,13 +3006,13 @@ "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Feil størrelse" @@ -3142,22 +3137,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3177,6 +3172,17 @@ msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke for: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Ingen nøkkelring installert i %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3353,14 +3359,7 @@ "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ne.po apt-0.8.13.2ubuntu4.1/po/ne.po --- apt-0.8.13.2ubuntu2/po/ne.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ne.po 2011-07-07 12:28:01.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -2053,35 +2053,29 @@ msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "स्थापना परित्याग गरिदैछ ।" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2430,7 +2424,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" @@ -2896,58 +2890,59 @@ msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2956,7 +2951,7 @@ "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2965,13 +2960,13 @@ "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -3093,22 +3088,22 @@ msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i रेकर्डहरू लेखियो ।\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" @@ -3128,6 +3123,17 @@ msgid "Hash mismatch for: %s" msgstr "MD5Sum मेल भएन" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "स्थापना परित्याग गरिदैछ ।" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3291,14 +3297,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/nl.po apt-0.8.13.2ubuntu4.1/po/nl.po --- apt-0.8.13.2ubuntu2/po/nl.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/nl.po 2011-07-07 12:28:02.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-03-16 06:52+0100\n" "Last-Translator: Frans Pop \n" "Language-Team: Dutch \n" @@ -2097,39 +2097,33 @@ msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Geen sleutelring geïnstalleerd in %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2493,7 +2487,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" @@ -2976,28 +2970,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "herbenoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" @@ -3005,29 +2999,30 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3036,7 +3031,7 @@ "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3045,7 +3040,7 @@ "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3053,7 +3048,7 @@ "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -3178,22 +3173,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3215,6 +3210,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash-som komt niet overeen voor: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Geen sleutelring geïnstalleerd in %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3380,14 +3386,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/nn.po apt-0.8.13.2ubuntu4.1/po/nn.po --- apt-0.8.13.2ubuntu2/po/nn.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/nn.po 2011-07-07 12:28:02.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -2068,35 +2068,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Avbryt installasjon." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2445,7 +2439,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" @@ -2917,58 +2911,59 @@ msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2977,7 +2972,7 @@ "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2985,14 +2980,14 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Feil storleik" @@ -3114,22 +3109,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3149,6 +3144,17 @@ msgid "Hash mismatch for: %s" msgstr "Feil MD5-sum" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Avbryt installasjon." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3312,14 +3318,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/pl.po apt-0.8.13.2ubuntu4.1/po/pl.po --- apt-0.8.13.2ubuntu2/po/pl.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/pl.po 2011-07-07 12:28:02.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2009-09-27 03:42+0100\n" "Last-Translator: Wiktor Wandachowicz \n" "Language-Team: Polish \n" @@ -2093,39 +2093,33 @@ msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Przerywanie instalacji" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku " "klucza?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2479,7 +2473,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" @@ -2948,57 +2942,58 @@ msgid "rename failed, %s (%s -> %s)." msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się zanalizować pliku Release %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3007,7 +3002,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3016,14 +3011,14 @@ "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Błędny rozmiar" @@ -3148,22 +3143,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3183,6 +3178,17 @@ msgid "Hash mismatch for: %s" msgstr "Błędna suma kontrolna" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Przerywanie instalacji" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3348,14 +3354,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/pt_BR.po apt-0.8.13.2ubuntu4.1/po/pt_BR.po --- apt-0.8.13.2ubuntu2/po/pt_BR.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/pt_BR.po 2011-07-07 12:28:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\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)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3014,7 +3009,7 @@ "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3023,7 +3018,7 @@ "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3031,7 +3026,7 @@ "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -3154,22 +3149,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3191,6 +3186,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortando instalação." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3354,14 +3360,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/pt.po apt-0.8.13.2ubuntu4.1/po/pt.po --- apt-0.8.13.2ubuntu2/po/pt.po 2011-04-07 10:52:40.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/pt.po 2011-07-07 12:28:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-28 09:03+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -2093,38 +2093,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Nenhum keyring instalado em %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2484,7 +2478,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" @@ -2970,28 +2964,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível fazer parse ao ficheiro Release %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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 " @@ -3000,17 +2994,17 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Ficheiro Release expirou, a ignorar %s (inválido desde %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3020,12 +3014,13 @@ "actualizado e serão utilizados os ficheiros anteriores de índice. Erro do " "GPG: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3035,7 +3030,7 @@ "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3044,7 +3039,7 @@ "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3052,7 +3047,7 @@ "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -3177,22 +3172,22 @@ msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3214,6 +3209,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash não coincide para: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Nenhum keyring instalado em %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3394,14 +3400,7 @@ "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ro.po apt-0.8.13.2ubuntu4.1/po/ro.po --- apt-0.8.13.2ubuntu2/po/ro.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ro.po 2011-07-07 12:28:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -2101,38 +2101,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Abandonez instalarea." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2486,7 +2480,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" @@ -2962,28 +2956,28 @@ msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eșuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " @@ -2992,29 +2986,30 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3023,7 +3018,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3032,7 +3027,7 @@ "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3040,7 +3035,7 @@ "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -3164,22 +3159,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3200,6 +3195,17 @@ msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abandonez instalarea." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3364,14 +3370,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/ru.po apt-0.8.13.2ubuntu4.1/po/ru.po --- apt-0.8.13.2ubuntu2/po/ru.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/ru.po 2011-07-07 12:28:02.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-24 21:35+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -2116,36 +2116,30 @@ msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Связка ключей в %s не установлена." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить gpgv для проверки подписи (gpgv установлена?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2507,7 +2501,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" @@ -2984,45 +2978,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно разобрать содержимое файла Release (%s)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Файл Release просрочен, игнорируется %s (недостоверный начиная с %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3031,12 +3025,13 @@ "Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут " "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3045,7 +3040,7 @@ "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3054,13 +3049,13 @@ "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -3185,22 +3180,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3222,6 +3217,17 @@ msgid "Hash mismatch for: %s" msgstr "Не совпадает хеш сумма для: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Связка ключей в %s не установлена." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3402,14 +3408,7 @@ "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/sk.po apt-0.8.13.2ubuntu4.1/po/sk.po --- apt-0.8.13.2ubuntu2/po/sk.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/sk.po 2011-07-07 12:28:02.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-24 23:57+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -2083,34 +2083,28 @@ msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2465,7 +2459,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Nedá sa otvoriť súbor %s" @@ -2936,45 +2930,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Nezhoda kontrolných MD5 súčtov" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Nezhoda kontrolných haš súčtov" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nedá spracovať súbor Release %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Platnosť súboru Release vypršala, ignoruje sa %s (neplatný od %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2983,12 +2977,13 @@ "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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2997,7 +2992,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3006,13 +3001,13 @@ "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -3137,22 +3132,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3172,6 +3167,17 @@ msgid "Hash mismatch for: %s" msgstr "Nezhoda kontrolných haš súčtov: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3350,14 +3356,7 @@ "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/sl.po apt-0.8.13.2ubuntu4.1/po/sl.po --- apt-0.8.13.2ubuntu2/po/sl.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/sl.po 2011-07-07 12:28:02.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2011-03-06 15:47+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -2083,35 +2083,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "V %s ni nameščenih zbirk ključev." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Najden je bil vsaj en neveljaven podpis." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Neznana napaka med izvajanjem gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Naslednji podpisi so bili neveljavni:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2465,7 +2459,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Pod-opravilo %s se je nepričakovano zaključilo" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Ni mogoče odpreti datoteke %s" @@ -2938,16 +2932,16 @@ msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje je spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Neujemanje vsote razpršil" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2956,29 +2950,29 @@ "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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Datoteka Release je potekla, prezrtje %s (neveljavno od %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2987,12 +2981,13 @@ "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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3001,7 +2996,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3010,7 +3005,7 @@ "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3018,7 +3013,7 @@ "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket " "%s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -3143,22 +3138,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisanih je bilo %i zapisov.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3180,6 +3175,17 @@ msgid "Hash mismatch for: %s" msgstr "Neujemanje razpršila za: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "V %s ni nameščenih zbirk ključev." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3356,14 +3362,7 @@ "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "kratko branje v kopiji_medpomnilnika %s" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3442,6 +3441,9 @@ #~ msgid "Internal error, group '%s' has no installable pseudo package" #~ msgstr "Notranja napaka, skupina '%s' nima namestljivega psevdo paketa" +#~ msgid "short read in buffer_copy %s" +#~ msgstr "kratko branje v kopiji_medpomnilnika %s" + #~ msgid "" #~ "Usage: apt-cache [options] command\n" #~ " apt-cache [options] add file1 [file2 ...]\n" diff -Nru apt-0.8.13.2ubuntu2/po/sv.po apt-0.8.13.2ubuntu4.1/po/sv.po --- apt-0.8.13.2ubuntu2/po/sv.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/sv.po 2011-07-07 12:28:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -2100,37 +2100,31 @@ msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Ingen nyckelring installerad i %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2486,7 +2480,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" @@ -2965,45 +2959,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Release-filen har gått ut, ignorerar %s (ogiltig sedan %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, 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:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3013,12 +3007,13 @@ "uppdaterats och de tidigare indexfilerna kommer att användas. GPG-fel: %s: " "%s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3027,7 +3022,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3036,13 +3031,13 @@ "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@ -3167,22 +3162,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, 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" @@ -3202,6 +3197,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash-kontrollsumman stämmer inte för: %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "Ingen nyckelring installerad i %s." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3381,14 +3387,7 @@ "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/th.po apt-0.8.13.2ubuntu4.1/po/th.po --- apt-0.8.13.2ubuntu2/po/th.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/th.po 2011-07-07 12:28:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2008-11-06 15:54+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -2039,35 +2039,29 @@ msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "จะล้มเลิกการติดตั้ง" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2415,7 +2409,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" @@ -2878,77 +2872,78 @@ msgid "rename failed, %s (%s -> %s)." msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, 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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -3071,22 +3066,22 @@ msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "เขียนแล้ว %i ระเบียน\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" @@ -3106,6 +3101,17 @@ msgid "Hash mismatch for: %s" msgstr "ผลรวมแฮชไม่ตรงกัน" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "จะล้มเลิกการติดตั้ง" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3271,14 +3277,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/tl.po apt-0.8.13.2ubuntu4.1/po/tl.po --- apt-0.8.13.2ubuntu2/po/tl.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/tl.po 2011-07-07 12:28:03.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -2080,38 +2080,32 @@ msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Ina-abort ang pag-instol." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 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:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2469,7 +2463,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" @@ -2945,58 +2939,59 @@ msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, 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:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3005,7 +3000,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3014,7 +3009,7 @@ "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3022,7 +3017,7 @@ "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -3146,22 +3141,22 @@ 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/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, 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:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, 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:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3183,6 +3178,17 @@ msgid "Hash mismatch for: %s" msgstr "Di tugmang MD5Sum" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Ina-abort ang pag-instol." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3346,14 +3352,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/uk.po apt-0.8.13.2ubuntu4.1/po/uk.po --- apt-0.8.13.2ubuntu2/po/uk.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/uk.po 2011-07-07 12:28:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko \n" "Language-Team: Українська \n" @@ -2098,37 +2098,31 @@ msgid "Unable to connect to %s:%s:" msgstr "Не можливо під'єднатися до %s %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Переривається встановлення." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Слідуючі підписи були невірними:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2489,7 +2483,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Не можливо відкрити файл %s" @@ -2963,29 +2957,29 @@ msgid "rename failed, %s (%s -> %s)." msgstr "Не вдалося перейменувати, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 #, fuzzy msgid "Hash Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо обробити файл %s пакунку (1)" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ID ключа:\n" @@ -2993,29 +2987,30 @@ #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3024,7 +3019,7 @@ "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3033,14 +3028,14 @@ "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -3162,22 +3157,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Перелік джерел для цього диску:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Записано %i записів.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записано %i записів з %i невідповідними файлам\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" @@ -3197,6 +3192,17 @@ msgid "Hash mismatch for: %s" msgstr "Невідповідність MD5Sum" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Переривається встановлення." + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3361,14 +3367,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff -Nru apt-0.8.13.2ubuntu2/po/vi.po apt-0.8.13.2ubuntu4.1/po/vi.po --- apt-0.8.13.2ubuntu2/po/vi.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/vi.po 2011-07-07 12:28:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-09-29 21:36+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -2110,35 +2110,29 @@ msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "Không có vòng khoá nào được cài đặt vào %s." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ : chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 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:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện « gpgv » để thẩm tra chữ ký (gpgv có được cài đặt chưa?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi không rõ khi thực hiện gpgv" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây vẫn không hợp lệ:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2495,7 +2489,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình phụ %s đã thoát bất thường" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" @@ -2980,45 +2974,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "Sai khớp MD5Sum (tổng kiểm)" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 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" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Tập tin phát hành đã hết hạn nên bỏ qua %s (không hợp lệ kể từ %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3028,12 +3022,13 @@ "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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3042,7 +3037,7 @@ "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:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -3051,7 +3046,7 @@ "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3059,7 +3054,7 @@ "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "Sai khớp kích cỡ" @@ -3186,22 +3181,22 @@ msgid "Source list entries for this disc are:\n" msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "Mới ghi %i mục ghi.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3223,6 +3218,17 @@ msgid "Hash mismatch for: %s" msgstr "Sai khớp chuỗi duy nhất cho : %s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, 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/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3394,14 +3400,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi « không đủ bộ nhớ »" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 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 ngụ ý một lỗi « V/R dpkg »" diff -Nru apt-0.8.13.2ubuntu2/po/zh_CN.po apt-0.8.13.2ubuntu4.1/po/zh_CN.po --- apt-0.8.13.2ubuntu2/po/zh_CN.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/zh_CN.po 2011-07-07 12:28:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -2046,34 +2046,28 @@ msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s:%s:" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:71 -#, c-format -msgid "No keyring installed in %s." -msgstr "%s 中没有安装密钥环。" - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:175 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:180 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:214 methods/gpgv.cc:221 msgid "The following signatures were invalid:\n" msgstr "下列签名无效:\n" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:228 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2421,7 +2415,7 @@ msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:764 +#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" @@ -2890,45 +2884,45 @@ msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件,%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Release 文件已过期,忽略 %s (从 %s 起无效)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版:%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2936,12 +2930,13 @@ msgstr "" "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n" -#: apt-pkg/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误:%s: %s" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2950,7 +2945,7 @@ "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2958,13 +2953,13 @@ msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "大小不符" @@ -3089,22 +3084,22 @@ msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n" @@ -3124,6 +3119,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash 校验和不符:%s" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s 中没有安装密钥环。" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3287,14 +3293,7 @@ "error" msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。" diff -Nru apt-0.8.13.2ubuntu2/po/zh_TW.po apt-0.8.13.2ubuntu4.1/po/zh_TW.po --- apt-0.8.13.2ubuntu2/po/zh_TW.po 2011-04-07 10:52:41.000000000 +0000 +++ apt-0.8.13.2ubuntu4.1/po/zh_TW.po 2011-07-07 12:28:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 12:52+0200\n" +"POT-Creation-Date: 2011-07-07 08:27-0400\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] %s)." msgstr "無法重新命名,%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:628 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:892 apt-pkg/acquire-item.cc:1778 -#: apt-pkg/acquire-item.cc:1921 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1826 +#: apt-pkg/acquire-item.cc:1969 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1346 +#: apt-pkg/acquire-item.cc:1388 #, 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:1361 +#: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰:\n" #. 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) -#: apt-pkg/acquire-item.cc:1434 +#: apt-pkg/acquire-item.cc:1476 #, fuzzy, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "Release 檔已過期,略過 %s(有效期限 %s)" -#: apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A 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/acquire-item.cc:1497 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1569 +#: apt-pkg/acquire-item.cc:1617 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2938,20 +2933,20 @@ "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平" "台)" -#: apt-pkg/acquire-item.cc:1628 +#: apt-pkg/acquire-item.cc:1676 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1683 +#: apt-pkg/acquire-item.cc:1731 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1818 msgid "Size mismatch" msgstr "大小不符" @@ -3072,22 +3067,22 @@ msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了。\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案不符\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了,有 %i 個檔案不符\n" @@ -3107,6 +3102,17 @@ msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" +#: apt-pkg/indexcopy.cc:677 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:708 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "放棄安裝。" + #: apt-pkg/cacheset.cc:337 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3270,14 +3276,7 @@ "error" msgstr "" -#. do not report dpkg I/O errors, this is a format string, so we compare -#. the prefix and the suffix of the error with the dpkg error message -#: apt-pkg/deb/dpkgpm.cc:1327 -#, c-format -msgid "short read in buffer_copy %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1337 +#: apt-pkg/deb/dpkgpm.cc:1342 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr ""