summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire-item.cc26
-rw-r--r--apt-pkg/contrib/gpgv.cc385
-rw-r--r--apt-pkg/contrib/gpgv.h82
-rw-r--r--apt-pkg/contrib/strutl.cc8
-rw-r--r--apt-pkg/contrib/strutl.h1
-rw-r--r--apt-pkg/deb/debindexfile.cc8
-rw-r--r--apt-pkg/deb/deblistparser.cc12
-rw-r--r--apt-pkg/deb/debmetaindex.cc31
-rw-r--r--apt-pkg/indexcopy.cc122
-rw-r--r--apt-pkg/indexcopy.h17
-rw-r--r--apt-pkg/indexrecords.cc6
-rw-r--r--apt-pkg/makefile14
-rw-r--r--configure.in2
-rw-r--r--debian/changelog28
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot158
-rw-r--r--doc/po/de.po156
-rw-r--r--doc/po/es.po156
-rw-r--r--doc/po/fr.po156
-rw-r--r--doc/po/it.po2461
-rw-r--r--doc/po/ja.po156
-rw-r--r--doc/po/pl.po156
-rw-r--r--doc/po/pt.po156
-rw-r--r--doc/po/pt_BR.po156
-rw-r--r--ftparchive/writer.cc105
-rw-r--r--methods/gpgv.cc15
-rw-r--r--po/apt-all.pot122
-rw-r--r--po/ar.po122
-rw-r--r--po/ast.po122
-rw-r--r--po/bg.po125
-rw-r--r--po/bs.po122
-rw-r--r--po/ca.po125
-rw-r--r--po/cs.po125
-rw-r--r--po/cy.po122
-rw-r--r--po/da.po125
-rw-r--r--po/de.po125
-rw-r--r--po/dz.po122
-rw-r--r--po/el.po122
-rw-r--r--po/es.po122
-rw-r--r--po/eu.po122
-rw-r--r--po/fi.po122
-rw-r--r--po/fr.po127
-rw-r--r--po/gl.po122
-rw-r--r--po/hu.po125
-rw-r--r--po/it.po125
-rw-r--r--po/ja.po125
-rw-r--r--po/km.po122
-rw-r--r--po/ko.po122
-rw-r--r--po/ku.po122
-rw-r--r--po/lt.po126
-rw-r--r--po/mr.po122
-rw-r--r--po/nb.po122
-rw-r--r--po/ne.po122
-rw-r--r--po/nl.po122
-rw-r--r--po/nn.po122
-rw-r--r--po/pl.po125
-rw-r--r--po/pt.po125
-rw-r--r--po/pt_BR.po122
-rw-r--r--po/ro.po122
-rw-r--r--po/ru.po125
-rw-r--r--po/sk.po125
-rw-r--r--po/sl.po125
-rw-r--r--po/sv.po122
-rw-r--r--po/th.po125
-rw-r--r--po/tl.po122
-rw-r--r--po/uk.po125
-rw-r--r--po/vi.po125
-rw-r--r--po/zh_CN.po122
-rw-r--r--po/zh_TW.po122
-rw-r--r--test/integration/framework10
-rwxr-xr-xtest/integration/test-apt-cdrom2
-rwxr-xr-xtest/integration/test-cve-2013-1051-InRelease-parsing61
-rwxr-xr-xtest/integration/test-ubuntu-bug-784473-InRelease-one-message-only14
73 files changed, 5336 insertions, 4629 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a71886a87..9b7862111 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1503,20 +1503,17 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
if (AuthPass == true)
{
// gpgv method failed, if we have a good signature
- string LastGoodSigFile = _config->FindDir("Dir::State::lists");
- if (DestFile == SigFile)
- LastGoodSigFile.append(URItoFileName(RealURI));
- else
- LastGoodSigFile.append("partial/").append(URItoFileName(RealURI)).append(".gpg.reverify");
+ string LastGoodSigFile = _config->FindDir("Dir::State::lists").append("partial/").append(URItoFileName(RealURI));
+ if (DestFile != SigFile)
+ LastGoodSigFile.append(".gpg");
+ LastGoodSigFile.append(".reverify");
if(FileExists(LastGoodSigFile))
{
+ string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
if (DestFile != SigFile)
- {
- string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
- URItoFileName(RealURI) + ".gpg";
- Rename(LastGoodSigFile,VerifiedSigFile);
- }
+ VerifiedSigFile.append(".gpg");
+ Rename(LastGoodSigFile, VerifiedSigFile);
Status = StatTransientNetworkError;
_error->Warning(_("A error occurred during the signature "
"verification. The repository is not updated "
@@ -1577,6 +1574,15 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner, /*{{{*/
MetaSigURI(MetaSigURI), MetaSigURIDesc(MetaSigURIDesc), MetaSigShortDesc(MetaSigShortDesc)
{
SigFile = DestFile;
+
+ // keep the old InRelease around in case of transistent network errors
+ string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
+ struct stat Buf;
+ if (stat(Final.c_str(),&Buf) == 0)
+ {
+ string const LastGoodSig = DestFile + ".reverify";
+ Rename(Final,LastGoodSig);
+ }
}
/*}}}*/
// pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
new file mode 100644
index 000000000..ba059dd87
--- /dev/null
+++ b/apt-pkg/contrib/gpgv.cc
@@ -0,0 +1,385 @@
+// -*- mode: cpp; mode: fold -*-
+// Include Files /*{{{*/
+#include<config.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include<apt-pkg/configuration.h>
+#include<apt-pkg/error.h>
+#include<apt-pkg/strutl.h>
+#include<apt-pkg/fileutl.h>
+#include<apt-pkg/gpgv.h>
+
+#include <apti18n.h>
+ /*}}}*/
+static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/
+{
+ const char *tmpdir = getenv("TMPDIR");
+#ifdef P_tmpdir
+ if (!tmpdir)
+ tmpdir = P_tmpdir;
+#endif
+ if (!tmpdir)
+ tmpdir = "/tmp";
+
+ std::string out;
+ strprintf(out, "%s/%s.XXXXXX", tmpdir, basename);
+ return strdup(out.c_str());
+}
+ /*}}}*/
+// ExecGPGV - returns the command needed for verify /*{{{*/
+// ---------------------------------------------------------------------
+/* Generating the commandline for calling gpgv is somehow complicated as
+ we need to add multiple keyrings and user supplied options.
+ Also, as gpgv has no options to enforce a certain reduced style of
+ clear-signed files (=the complete content of the file is signed and
+ the content isn't encoded) we do a divide and conquer approach here
+ and split up the clear-signed file in message and signature for gpgv
+*/
+void ExecGPGV(std::string const &File, std::string const &FileGPG,
+ int const &statusfd, int fd[2])
+{
+ #define EINTERNAL 111
+ std::string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
+ // FIXME: remove support for deprecated APT::GPGV setting
+ std::string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
+ std::string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
+
+ bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
+
+ if (Debug == true)
+ {
+ std::clog << "gpgv path: " << gpgvpath << std::endl;
+ std::clog << "Keyring file: " << trustedFile << std::endl;
+ std::clog << "Keyring path: " << trustedPath << std::endl;
+ }
+
+ std::vector<std::string> keyrings;
+ if (DirectoryExists(trustedPath))
+ keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
+ if (RealFileExists(trustedFile) == true)
+ keyrings.push_back(trustedFile);
+
+ std::vector<const char *> Args;
+ Args.reserve(30);
+
+ if (keyrings.empty() == true)
+ {
+ // TRANSLATOR: %s is the trusted keyring parts directory
+ ioprintf(std::cerr, _("No keyring installed in %s."),
+ _config->FindDir("Dir::Etc::TrustedParts").c_str());
+ exit(EINTERNAL);
+ }
+
+ Args.push_back(gpgvpath.c_str());
+ Args.push_back("--ignore-time-conflict");
+
+ char statusfdstr[10];
+ if (statusfd != -1)
+ {
+ Args.push_back("--status-fd");
+ snprintf(statusfdstr, sizeof(statusfdstr), "%i", statusfd);
+ Args.push_back(statusfdstr);
+ }
+
+ for (std::vector<std::string>::const_iterator K = keyrings.begin();
+ K != keyrings.end(); ++K)
+ {
+ Args.push_back("--keyring");
+ Args.push_back(K->c_str());
+ }
+
+ Configuration::Item const *Opts;
+ Opts = _config->Tree("Acquire::gpgv::Options");
+ if (Opts != 0)
+ {
+ Opts = Opts->Child;
+ for (; Opts != 0; Opts = Opts->Next)
+ {
+ if (Opts->Value.empty() == true)
+ continue;
+ Args.push_back(Opts->Value.c_str());
+ }
+ }
+
+ std::vector<std::string> dataHeader;
+ char * sig = NULL;
+ char * data = NULL;
+
+ // file with detached signature
+ if (FileGPG != File)
+ {
+ Args.push_back(FileGPG.c_str());
+ Args.push_back(File.c_str());
+ }
+ else // clear-signed file
+ {
+ sig = GenerateTemporaryFileTemplate("apt.sig");
+ data = GenerateTemporaryFileTemplate("apt.data");
+ if (sig == NULL || data == NULL)
+ {
+ ioprintf(std::cerr, "Couldn't create tempfile names for splitting up %s", File.c_str());
+ exit(EINTERNAL);
+ }
+
+ int const sigFd = mkstemp(sig);
+ int const dataFd = mkstemp(data);
+ if (sigFd == -1 || dataFd == -1)
+ {
+ if (dataFd != -1)
+ unlink(sig);
+ if (sigFd != -1)
+ unlink(data);
+ ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str());
+ exit(EINTERNAL);
+ }
+
+ FileFd signature;
+ signature.OpenDescriptor(sigFd, FileFd::WriteOnly, true);
+ FileFd message;
+ message.OpenDescriptor(dataFd, FileFd::WriteOnly, true);
+
+ if (signature.Failed() == true || message.Failed() == true ||
+ SplitClearSignedFile(File, &message, &dataHeader, &signature) == false)
+ {
+ if (dataFd != -1)
+ unlink(sig);
+ if (sigFd != -1)
+ unlink(data);
+ ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str());
+ exit(EINTERNAL);
+ }
+ Args.push_back(sig);
+ Args.push_back(data);
+ }
+
+ Args.push_back(NULL);
+
+ if (Debug == true)
+ {
+ std::clog << "Preparing to exec: " << gpgvpath;
+ for (std::vector<const char *>::const_iterator a = Args.begin(); *a != NULL; ++a)
+ std::clog << " " << *a;
+ std::clog << std::endl;
+ }
+
+ if (statusfd != -1)
+ {
+ int const nullfd = open("/dev/null", O_RDONLY);
+ close(fd[0]);
+ // Redirect output to /dev/null; we read from the status fd
+ if (statusfd != STDOUT_FILENO)
+ dup2(nullfd, STDOUT_FILENO);
+ if (statusfd != STDERR_FILENO)
+ dup2(nullfd, STDERR_FILENO);
+ // Redirect the pipe to the status fd (3)
+ dup2(fd[1], statusfd);
+
+ putenv((char *)"LANG=");
+ putenv((char *)"LC_ALL=");
+ putenv((char *)"LC_MESSAGES=");
+ }
+
+ if (FileGPG != File)
+ {
+ execvp(gpgvpath.c_str(), (char **) &Args[0]);
+ ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());
+ exit(EINTERNAL);
+ }
+ else
+ {
+//#define UNLINK_EXIT(X) exit(X)
+#define UNLINK_EXIT(X) unlink(sig);unlink(data);exit(X)
+
+ // for clear-signed files we have created tempfiles we have to clean up
+ // and we do an additional check, so fork yet another time …
+ pid_t pid = ExecFork();
+ if(pid < 0) {
+ ioprintf(std::cerr, "Fork failed for %s to check %s", Args[0], File.c_str());
+ UNLINK_EXIT(EINTERNAL);
+ }
+ if(pid == 0)
+ {
+ if (statusfd != -1)
+ dup2(fd[1], statusfd);
+ execvp(gpgvpath.c_str(), (char **) &Args[0]);
+ ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());
+ UNLINK_EXIT(EINTERNAL);
+ }
+
+ // Wait and collect the error code - taken from WaitPid as we need the exact Status
+ int Status;
+ while (waitpid(pid,&Status,0) != pid)
+ {
+ if (errno == EINTR)
+ continue;
+ ioprintf(std::cerr, _("Waited for %s but it wasn't there"), "gpgv");
+ UNLINK_EXIT(EINTERNAL);
+ }
+#undef UNLINK_EXIT
+ // we don't need the files any longer
+ unlink(sig);
+ unlink(data);
+ free(sig);
+ free(data);
+
+ // check if it exit'ed normally …
+ if (WIFEXITED(Status) == false)
+ {
+ ioprintf(std::cerr, _("Sub-process %s exited unexpectedly"), "gpgv");
+ exit(EINTERNAL);
+ }
+
+ // … and with a good exit code
+ if (WEXITSTATUS(Status) != 0)
+ {
+ ioprintf(std::cerr, _("Sub-process %s returned an error code (%u)"), "gpgv", WEXITSTATUS(Status));
+ exit(WEXITSTATUS(Status));
+ }
+
+ // everything fine
+ exit(0);
+ }
+ exit(EINTERNAL); // unreachable safe-guard
+}
+ /*}}}*/
+// SplitClearSignedFile - split message into data/signature /*{{{*/
+bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
+ std::vector<std::string> * const ContentHeader, FileFd * const SignatureFile)
+{
+ FILE *in = fopen(InFile.c_str(), "r");
+ if (in == NULL)
+ return _error->Errno("fopen", "can not open %s", InFile.c_str());
+
+ bool found_message_start = false;
+ bool found_message_end = false;
+ bool skip_until_empty_line = false;
+ bool found_signature = false;
+ bool first_line = true;
+
+ char *buf = NULL;
+ size_t buf_size = 0;
+ ssize_t line_len = 0;
+ while ((line_len = getline(&buf, &buf_size, in)) != -1)
+ {
+ _strrstrip(buf);
+ if (found_message_start == false)
+ {
+ if (strcmp(buf, "-----BEGIN PGP SIGNED MESSAGE-----") == 0)
+ {
+ found_message_start = true;
+ skip_until_empty_line = true;
+ }
+ }
+ else if (skip_until_empty_line == true)
+ {
+ if (strlen(buf) == 0)
+ skip_until_empty_line = false;
+ // save "Hash" Armor Headers, others aren't allowed
+ else if (ContentHeader != NULL && strncmp(buf, "Hash: ", strlen("Hash: ")) == 0)
+ ContentHeader->push_back(buf);
+ }
+ else if (found_signature == false)
+ {
+ if (strcmp(buf, "-----BEGIN PGP SIGNATURE-----") == 0)
+ {
+ found_signature = true;
+ found_message_end = true;
+ if (SignatureFile != NULL)
+ {
+ SignatureFile->Write(buf, strlen(buf));
+ SignatureFile->Write("\n", 1);
+ }
+ }
+ else if (found_message_end == false) // we are in the message block
+ {
+ // we don't have any fields which need dash-escaped,
+ // but implementations are free to encode all lines …
+ char const * dashfree = buf;
+ if (strncmp(dashfree, "- ", 2) == 0)
+ dashfree += 2;
+ if(first_line == true) // first line does not need a newline
+ first_line = false;
+ else if (ContentFile != NULL)
+ ContentFile->Write("\n", 1);
+ else
+ continue;
+ if (ContentFile != NULL)
+ ContentFile->Write(dashfree, strlen(dashfree));
+ }
+ }
+ else if (found_signature == true)
+ {
+ if (SignatureFile != NULL)
+ {
+ SignatureFile->Write(buf, strlen(buf));
+ SignatureFile->Write("\n", 1);
+ }
+ if (strcmp(buf, "-----END PGP SIGNATURE-----") == 0)
+ found_signature = false; // look for other signatures
+ }
+ // all the rest is whitespace, unsigned garbage or additional message blocks we ignore
+ }
+ fclose(in);
+
+ if (found_signature == true)
+ return _error->Error("Signature in file %s wasn't closed", InFile.c_str());
+
+ // if we haven't found any of them, this an unsigned file,
+ // so don't generate an error, but splitting was unsuccessful none-the-less
+ if (first_line == true && found_message_start == false && found_message_end == false)
+ return false;
+ // otherwise one missing indicates a syntax error
+ else if (first_line == false || found_message_start == false || found_message_end == false)
+ return _error->Error("Splitting of file %s failed as it doesn't contain all expected parts", InFile.c_str());
+
+ return true;
+}
+ /*}}}*/
+bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &MessageFile) /*{{{*/
+{
+ char * const message = GenerateTemporaryFileTemplate("fileutl.message");
+ int const messageFd = mkstemp(message);
+ if (messageFd == -1)
+ {
+ free(message);
+ return _error->Errno("mkstemp", "Couldn't create temporary file to work with %s", ClearSignedFileName.c_str());
+ }
+ // we have the fd, thats enough for us
+ unlink(message);
+ free(message);
+
+ MessageFile.OpenDescriptor(messageFd, FileFd::ReadWrite, true);
+ if (MessageFile.Failed() == true)
+ return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str());
+
+ _error->PushToStack();
+ bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), &MessageFile, NULL, NULL);
+ bool const errorDone = _error->PendingError();
+ _error->MergeWithStack();
+ if (splitDone == false)
+ {
+ MessageFile.Close();
+
+ if (errorDone == true)
+ return false;
+
+ // we deal with an unsigned file
+ MessageFile.Open(ClearSignedFileName, FileFd::ReadOnly);
+ }
+ else // clear-signed
+ {
+ if (MessageFile.Seek(0) == false)
+ return _error->Errno("lseek", "Unable to seek back in message for file %s", ClearSignedFileName.c_str());
+ }
+
+ return MessageFile.Failed() == false;
+}
+ /*}}}*/
diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
new file mode 100644
index 000000000..08b10a97a
--- /dev/null
+++ b/apt-pkg/contrib/gpgv.h
@@ -0,0 +1,82 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+/* ######################################################################
+
+ Helpers to deal with gpgv better and more easily
+
+ ##################################################################### */
+ /*}}}*/
+#ifndef CONTRIB_GPGV_H
+#define CONTRIB_GPGV_H
+
+#include <string>
+#include <vector>
+
+#include <apt-pkg/fileutl.h>
+
+#if __GNUC__ >= 4
+ #define APT_noreturn __attribute__ ((noreturn))
+#else
+ #define APT_noreturn /* no support */
+#endif
+
+/** \brief generates and run the command to verify a file with gpgv
+ *
+ * If File and FileSig specify the same file it is assumed that we
+ * deal with a clear-signed message. In that case the file will be
+ * rewritten to be in a good-known format without uneeded whitespaces
+ * and additional messages (unsigned or signed).
+ *
+ * @param File is the message (unsigned or clear-signed)
+ * @param FileSig is the signature (detached or clear-signed)
+ */
+void ExecGPGV(std::string const &File, std::string const &FileSig,
+ int const &statusfd, int fd[2]) APT_noreturn;
+inline void ExecGPGV(std::string const &File, std::string const &FileSig,
+ int const &statusfd = -1) {
+ int fd[2];
+ ExecGPGV(File, FileSig, statusfd, fd);
+};
+
+#undef APT_noreturn
+
+/** \brief Split an inline signature into message and signature
+ *
+ * Takes a clear-signed message and puts the first signed message
+ * in the content file and all signatures following it into the
+ * second. Unsigned messages, additional messages as well as
+ * whitespaces are discarded. The resulting files are suitable to
+ * be checked with gpgv.
+ *
+ * If a FileFd pointers is NULL it will not be used and the content
+ * which would have been written to it is silently discarded.
+ *
+ * The content of the split files is undefined if the splitting was
+ * unsuccessful.
+ *
+ * Note that trying to split an unsigned file will fail, but
+ * not generate an error message.
+ *
+ * @param InFile is the clear-signed file
+ * @param ContentFile is the FileFd the message will be written to
+ * @param ContentHeader is a list of all required Amored Headers for the message
+ * @param SignatureFile is the FileFd all signatures will be written to
+ * @return true if the splitting was successful, false otherwise
+ */
+bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
+ std::vector<std::string> * const ContentHeader, FileFd * const SignatureFile);
+
+/** \brief open a file which might be clear-signed
+ *
+ * This method tries to extract the (signed) message of a file.
+ * If the file isn't signed it will just open the given filename.
+ * Otherwise the message is extracted to a temporary file which
+ * will be opened instead.
+ *
+ * @param ClearSignedFileName is the name of the file to open
+ * @param[out] MessageFile is the FileFd in which the file will be opened
+ * @return true if opening was successful, otherwise false
+ */
+bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &MessageFile);
+
+#endif
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index ca096d736..9726138a0 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -117,7 +117,13 @@ char *_strstrip(char *String)
if (*String == 0)
return String;
-
+ return _strrstrip(String);
+}
+ /*}}}*/
+// strrstrip - Remove white space from the back of a string /*{{{*/
+// ---------------------------------------------------------------------
+char *_strrstrip(char *String)
+{
char *End = String + strlen(String) - 1;
for (;End != String - 1 && (*End == ' ' || *End == '\t' || *End == '\n' ||
*End == '\r'); End--);
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 337139d5d..e92f91dc0 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -35,6 +35,7 @@ using std::ostream;
bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
char *_strstrip(char *String);
+char *_strrstrip(char *String); // right strip only
char *_strtabexpand(char *String,size_t Len);
bool ParseQuoteWord(const char *&String,std::string &Res);
bool ParseCWord(const char *&String,std::string &Res);
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index de645bb6e..909dfcf47 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -22,6 +22,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/debmetaindex.h>
+#include <apt-pkg/gpgv.h>
#include <sys/stat.h>
/*}}}*/
@@ -337,7 +338,12 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
if (releaseExists == true || FileExists(ReleaseFile) == true)
{
- FileFd Rel(ReleaseFile,FileFd::ReadOnly);
+ FileFd Rel;
+ // Beware: The 'Release' file might be clearsigned in case the
+ // signature for an 'InRelease' file couldn't be checked
+ if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false)
+ return false;
+
if (_error->PendingError() == true)
return false;
Parser.LoadReleaseInfo(File,Rel,Section);
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 56d5297fc..d84a6a26d 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -801,13 +801,12 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
map_ptrloc const storage = WriteUniqString(component);
FileI->Component = storage;
- // FIXME: Code depends on the fact that Release files aren't compressed
+ // FIXME: should use FileFd and TagSection
FILE* release = fdopen(dup(File.Fd()), "r");
if (release == NULL)
return false;
char buffer[101];
- bool gpgClose = false;
while (fgets(buffer, sizeof(buffer), release) != NULL)
{
size_t len = 0;
@@ -819,15 +818,6 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
if (buffer[len] == '\0')
continue;
- // only evalute the first GPG section
- if (strncmp("-----", buffer, 5) == 0)
- {
- if (gpgClose == true)
- break;
- gpgClose = true;
- continue;
- }
-
// seperate the tag from the data
const char* dataStart = strchr(buffer + len, ':');
if (dataStart == NULL)
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 6c191fd95..7a88d71e3 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -229,6 +229,8 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
/*}}}*/
bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
{
+ bool const tryInRelease = _config->FindB("Acquire::TryInRelease", true);
+
// special case for --print-uris
if (GetAll) {
vector <struct IndexTarget *> *targets = ComputeIndexTargets();
@@ -239,18 +241,27 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
// this is normally created in pkgAcqMetaSig, but if we run
// in --print-uris mode, we add it here
- new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"),
- MetaIndexInfo("Release"), "Release",
- MetaIndexURI("Release.gpg"),
- ComputeIndexTargets(),
- new indexRecords (Dist));
+ if (tryInRelease == false)
+ new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"),
+ MetaIndexInfo("Release"), "Release",
+ MetaIndexURI("Release.gpg"),
+ ComputeIndexTargets(),
+ new indexRecords (Dist));
}
- new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"),
- MetaIndexInfo("Release.gpg"), "Release.gpg",
- MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
- ComputeIndexTargets(),
- new indexRecords (Dist));
+ if (tryInRelease == true)
+ new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"),
+ MetaIndexInfo("InRelease"), "InRelease",
+ MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
+ MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
+ ComputeIndexTargets(),
+ new indexRecords (Dist));
+ else
+ new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"),
+ MetaIndexInfo("Release.gpg"), "Release.gpg",
+ MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
+ ComputeIndexTargets(),
+ new indexRecords (Dist));
return true;
}
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index aa1f01a4a..f53989bdb 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -593,9 +593,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
if(pid == 0)
{
if (useInRelease == true)
- RunGPGV(inrelease, inrelease);
+ ExecGPGV(inrelease, inrelease);
else
- RunGPGV(release, releasegpg);
+ ExecGPGV(release, releasegpg);
}
if(!ExecWait(pid, "gpgv")) {
@@ -642,124 +642,6 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
return true;
}
/*}}}*/
-// SigVerify::RunGPGV - returns the command needed for verify /*{{{*/
-// ---------------------------------------------------------------------
-/* Generating the commandline for calling gpgv is somehow complicated as
- we need to add multiple keyrings and user supplied options. Also, as
- the cdrom code currently can not use the gpgv method we have two places
- these need to be done - so the place for this method is wrong but better
- than code duplication… */
-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"));
- string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
-
- bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
-
- if (Debug == true)
- {
- std::clog << "gpgv path: " << gpgvpath << std::endl;
- std::clog << "Keyring file: " << trustedFile << std::endl;
- std::clog << "Keyring path: " << trustedPath << std::endl;
- }
-
- std::vector<string> keyrings;
- if (DirectoryExists(trustedPath))
- keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
- if (RealFileExists(trustedFile) == true)
- keyrings.push_back(trustedFile);
-
- std::vector<const char *> Args;
- Args.reserve(30);
-
- if (keyrings.empty() == true)
- {
- // 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");
-
- if (statusfd != -1)
- {
- Args.push_back("--status-fd");
- char fd[10];
- snprintf(fd, sizeof(fd), "%i", statusfd);
- Args.push_back(fd);
- }
-
- for (vector<string>::const_iterator K = keyrings.begin();
- K != keyrings.end(); ++K)
- {
- Args.push_back("--keyring");
- Args.push_back(K->c_str());
- }
-
- Configuration::Item const *Opts;
- Opts = _config->Tree("Acquire::gpgv::Options");
- if (Opts != 0)
- {
- Opts = Opts->Child;
- for (; Opts != 0; Opts = Opts->Next)
- {
- if (Opts->Value.empty() == true)
- continue;
- Args.push_back(Opts->Value.c_str());
- }
- }
-
- Args.push_back(FileGPG.c_str());
- if (FileGPG != File)
- Args.push_back(File.c_str());
- Args.push_back(NULL);
-
- if (Debug == true)
- {
- std::clog << "Preparing to exec: " << gpgvpath;
- for (std::vector<const char *>::const_iterator a = Args.begin(); *a != NULL; ++a)
- std::clog << " " << *a;
- std::clog << std::endl;
- }
-
- if (statusfd != -1)
- {
- int const nullfd = open("/dev/null", O_RDONLY);
- close(fd[0]);
- // Redirect output to /dev/null; we read from the status fd
- dup2(nullfd, STDOUT_FILENO);
- dup2(nullfd, STDERR_FILENO);
- // Redirect the pipe to the status fd (3)
- dup2(fd[1], statusfd);
-
- putenv((char *)"LANG=");
- putenv((char *)"LC_ALL=");
- putenv((char *)"LC_MESSAGES=");
- }
-
- execvp(gpgvpath.c_str(), (char **) &Args[0]);
- return true;
-}
- /*}}}*/
bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
vector<string> &List, pkgCdromStatus *log)
{
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index e3de1afd9..aa221158e 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,6 +14,9 @@
#include <string>
#include <stdio.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/macros.h>
+
#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::vector;
@@ -96,13 +99,15 @@ class SigVerify /*{{{*/
bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
std::vector<std::string> PkgList,std::vector<std::string> SrcList);
- /** \brief generates and run the command to verify a file with gpgv */
- static bool RunGPGV(std::string const &File, std::string const &FileOut,
- int const &statusfd, int fd[2]);
- inline static bool RunGPGV(std::string const &File, std::string const &FileOut,
+ __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
+ int const &statusfd, int fd[2]) {
+ ExecGPGV(File, FileOut, statusfd, fd);
+ return false;
+ };
+ __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
int const &statusfd = -1) {
- int fd[2];
- return RunGPGV(File, FileOut, statusfd, fd);
+ ExecGPGV(File, FileOut, statusfd);
+ return false;
};
};
/*}}}*/
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 649b6059d..e37a78cfb 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -12,6 +12,7 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/gpgv.h>
#include <sys/stat.h>
#include <clocale>
@@ -57,7 +58,10 @@ bool indexRecords::Exists(string const &MetaKey) const
bool indexRecords::Load(const string Filename) /*{{{*/
{
- FileFd Fd(Filename, FileFd::ReadOnly);
+ FileFd Fd;
+ if (OpenMaybeClearSignedFile(Filename, Fd) == false)
+ return false;
+
pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX
if (_error->PendingError() == true)
{
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 27d7ead24..59729faf5 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -27,15 +27,13 @@ APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
contrib/hashsum.cc contrib/md5.cc contrib/sha1.cc \
- contrib/sha2_internal.cc\
- contrib/hashes.cc \
+ contrib/sha2_internal.cc contrib/hashes.cc \
contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
- contrib/fileutl.cc
-HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h\
- md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h\
- sha2_internal.h \
- hashes.h hashsum_template.h\
- macros.h weakptr.h
+ contrib/fileutl.cc contrib/gpgv.cc
+HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h \
+ md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h \
+ sha2_internal.h hashes.h hashsum_template.h \
+ macros.h weakptr.h gpgv.h
# Source code for the core main library
SOURCE+= pkgcache.cc version.cc depcache.cc \
diff --git a/configure.in b/configure.in
index b2414e649..f3a365ded 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.9~exp1"
+PACKAGE_VERSION="0.9.7.9~exp2~20130402"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index 21e76c818..239fb308c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,14 +12,38 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low
- fix test now that #1098752 is fixed
* po/{ca,cs,ru}.po:
- fix merge artifact
-
+
+ [ David Kalnischkies ]
+ * apt-pkg/indexcopy.cc:
+ - rename RunGPGV to ExecGPGV and move it to apt-pkg/contrib/gpgv.cc
+ * apt-pkg/contrib/gpgv.cc:
+ - ExecGPGV is a method which should never return, so mark it as such
+ and fix the inconsistency of returning in error cases
+ - don't close stdout/stderr if it is also the statusfd
+ - if ExecGPGV deals with a clear-signed file it will split this file
+ into data and signatures, pass it to gpgv for verification
+ - add method to open (maybe) clearsigned files transparently
+ * apt-pkg/acquire-item.cc:
+ - keep the last good InRelease file around just as we do it with
+ Release.gpg in case the new one we download isn't good for us
+ * apt-pkg/deb/debmetaindex.cc:
+ - reenable InRelease by default
+ * ftparchive/writer.cc,
+ apt-pkg/deb/debindexfile.cc,
+ apt-pkg/deb/deblistparser.cc:
+ - use OpenMaybeClearSignedFile to be free from detecting and
+ skipping clearsigning metadata in dsc and Release files
+
[ Michael Vogt ]
+ * add regression test for CVE-2013-1051
+ * implement GPGSplit() based on the idea from Ansgar Burchardt
+ (many thanks!)
* methods/connect.cc:
- use Errno() instead of strerror(), thanks to David Kalnischk
* doc/apt.conf.5.xml:
- document Acquire::ForceIPv{4,6}
- -- Christian Perrier <bubulle@debian.org> Sun, 24 Mar 2013 08:57:45 +0100
+ -- Michael Vogt <mvo@debian.org> Tue, 02 Apr 2013 15:13:50 +0200
apt (0.9.7.9~exp1) experimental; urgency=low
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 7bc82695f..240b368b0 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.9~exp1">
+<!ENTITY apt-product-version "0.9.7.9~exp2~20130402">
<!-- Codenames for debian releases -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 99cb3dfca..fae040cd5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.7.8\n"
+"Project-Id-Version: apt-doc 0.9.7.9~exp1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-14 08:05+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1105,12 +1105,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "See Also"
msgstr ""
@@ -2982,13 +2982,23 @@ msgid ""
"\"<literal>none</literal>\")."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3000,7 +3010,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3013,7 +3023,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3023,7 +3033,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -3031,7 +3041,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3043,7 +3053,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3056,7 +3066,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -3067,12 +3077,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3080,7 +3090,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3094,40 +3104,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -3135,7 +3145,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -3144,7 +3154,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -3154,7 +3164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -3165,26 +3175,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3199,7 +3209,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3209,7 +3219,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -3223,7 +3233,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -3236,7 +3246,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is "
@@ -3254,7 +3264,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure "
"--pending</command> to let &dpkg; handle all required configurations and "
@@ -3266,7 +3276,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3277,7 +3287,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3289,7 +3299,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3303,12 +3313,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3317,12 +3327,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3333,7 +3343,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3341,7 +3351,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -3349,7 +3359,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3359,65 +3369,65 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3425,52 +3435,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -3480,7 +3490,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -3498,45 +3508,45 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -3544,19 +3554,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3564,7 +3574,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 373cf8eb5..e4c7420b4 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1543,14 +1543,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "Dateien"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -4269,13 +4269,23 @@ msgstr ""
"in <filename>/var/lib/apt/lists/</filename> gefunden werden, an das Ende der "
"Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4295,7 +4305,7 @@ msgstr ""
"nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4318,7 +4328,7 @@ msgstr ""
"Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4333,7 +4343,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4345,7 +4355,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4363,7 +4373,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4383,7 +4393,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4401,12 +4411,12 @@ msgstr ""
"diese Muster verwandt werden."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4417,7 +4427,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4440,7 +4450,7 @@ msgstr ""
"vor dem Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4449,7 +4459,7 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4458,7 +4468,7 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4467,12 +4477,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr "Wie APT &dpkg; aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4481,7 +4491,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4492,7 +4502,7 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4506,7 +4516,7 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4522,7 +4532,7 @@ msgstr ""
"die es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4538,7 +4548,7 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4547,7 +4557,7 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4557,12 +4567,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4589,7 +4599,7 @@ msgstr ""
"Pakete konfiguriert werden."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4603,7 +4613,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4628,7 +4638,7 @@ msgstr ""
"Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4651,7 +4661,7 @@ msgstr ""
"anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4681,7 +4691,7 @@ msgstr ""
"enden könnte und möglicherweise nicht mehr startbar ist."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4700,7 +4710,7 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4716,7 +4726,7 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4734,7 +4744,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4758,12 +4768,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4777,12 +4787,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4800,7 +4810,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4811,7 +4821,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4822,7 +4832,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4834,7 +4844,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4843,12 +4853,12 @@ msgstr ""
"Daten in CD-ROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4856,28 +4866,28 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
"gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4886,7 +4896,7 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4895,13 +4905,13 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4910,7 +4920,7 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4921,7 +4931,7 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4931,14 +4941,14 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"protokolliert, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4947,7 +4957,7 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4956,7 +4966,7 @@ msgstr ""
"Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4966,7 +4976,7 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -4974,7 +4984,7 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -4984,7 +4994,7 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5000,7 +5010,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5033,7 +5043,7 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5043,7 +5053,7 @@ msgstr ""
"sind, aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5052,7 +5062,7 @@ msgstr ""
"und alle während deren Auswertung gefundenen Fehler aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5062,7 +5072,7 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5070,12 +5080,12 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr "gibt die Priorität jeder Paketliste beim Start aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5085,7 +5095,7 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5097,7 +5107,7 @@ msgstr ""
"Marker</literal> beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5106,13 +5116,13 @@ msgstr ""
"filename> gelesenen Anbieter aus."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5122,7 +5132,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/es.po b/doc/po/es.po
index 374af43e9..ade98d9cb 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1619,14 +1619,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -4307,13 +4307,23 @@ msgstr ""
"se añaden al final de la lista (después de un «<literal>none</literal>» "
"implícito)."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4334,7 +4344,7 @@ msgstr ""
"filename> ó <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4356,7 +4366,7 @@ msgstr ""
"directorio predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4372,7 +4382,7 @@ msgstr ""
"<envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4383,7 +4393,7 @@ msgstr ""
"Al finalizar este proceso carga el fichero de configuración principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4400,7 +4410,7 @@ msgstr ""
"literal> especifican la ubicación de sus respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4421,7 +4431,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4439,12 +4449,12 @@ msgstr ""
"de expresiones regulares."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4455,7 +4465,7 @@ msgstr ""
"encuentran en la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4477,7 +4487,7 @@ msgstr ""
"realiza esta acción antes de descargar paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4486,7 +4496,7 @@ msgstr ""
"la línea de ordenes al ejecutar la fase de instalación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4495,7 +4505,7 @@ msgstr ""
"la línea de ordenes al ejecutar la fase de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4505,12 +4515,12 @@ msgstr ""
"preguntará en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr "Invocación de APT a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4519,7 +4529,7 @@ msgstr ""
"se encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4530,7 +4540,7 @@ msgstr ""
"introduce a &dpkg; como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4543,7 +4553,7 @@ msgstr ""
"sh</filename>; en caso de fallo, APT cancela la acción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4559,7 +4569,7 @@ msgstr ""
"la entrada estándar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4575,7 +4585,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4584,7 +4594,7 @@ msgstr ""
"predeterminado es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4594,12 +4604,12 @@ msgstr ""
"paquetes y a producir todos los binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4626,7 +4636,7 @@ msgstr ""
"tiempo (o más) durante la configuración de todos los paquetes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4640,7 +4650,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4664,7 +4674,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4687,7 +4697,7 @@ msgstr ""
"eliminación."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4717,7 +4727,7 @@ msgstr ""
"imposibilidad de arrancar el sistema. "
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4735,7 +4745,7 @@ msgstr ""
"desactivar esta opción en todas las ejecuciones menos la última."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4751,7 +4761,7 @@ msgstr ""
"los disparadores necesarios para configurar este paquete."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4769,7 +4779,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4794,12 +4804,12 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr "Las opciones «Periodic» y «Archives»"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4813,12 +4823,12 @@ msgstr ""
"documentación de estas opciones."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr "Opciones de depuración"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4835,7 +4845,7 @@ msgstr ""
"para un usuario normal, aunque unas cuantas sí son:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4846,7 +4856,7 @@ msgstr ""
"purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4857,7 +4867,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) como un usuario normal."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4869,7 +4879,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4878,14 +4888,14 @@ msgstr ""
"statfs en los identificadores de los discos ópticos."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr ""
"A continuación, se muestra la lista completa de las opciones de depuración "
"de apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4893,26 +4903,26 @@ msgstr ""
"<literal>cdrom://</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante "
"HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4921,7 +4931,7 @@ msgstr ""
"criptográficas mediante <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4930,14 +4940,14 @@ msgstr ""
"paquetes almacenadas en CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Describe el proceso de resolución de dependencias de compilación en &apt-"
"get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4946,7 +4956,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4957,7 +4967,7 @@ msgstr ""
"identificador de un CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4967,14 +4977,14 @@ msgstr ""
"a la vez."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Registra los elementos que se añaden o se borran de la cola de descarga "
"global."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4984,7 +4994,7 @@ msgstr ""
"ficheros descargados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4993,7 +5003,7 @@ msgstr ""
"lista de índices de paquetes, y los errores relacionados con éstos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5003,7 +5013,7 @@ msgstr ""
"índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5011,7 +5021,7 @@ msgstr ""
"descargas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5020,7 +5030,7 @@ msgstr ""
"de los paquetes y con la eliminación de los paquetes sin usar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5036,7 +5046,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5067,7 +5077,7 @@ msgstr ""
"la sección en la que aparece el paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5076,7 +5086,7 @@ msgstr ""
"invocó, con los argumentos separados por un espacio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5085,7 +5095,7 @@ msgstr ""
"estado y cualquier error encontrado durante el análisis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5094,7 +5104,7 @@ msgstr ""
"literal> debería entregar los paquetes a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5102,12 +5112,12 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5116,7 +5126,7 @@ msgstr ""
"lo que ocurre cuando se encuentra un problema de dependencias complejo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5127,7 +5137,7 @@ msgstr ""
"misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5136,13 +5146,13 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5152,7 +5162,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index a1def193a..11e30906c 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-07-04 21:08-0600\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1538,14 +1538,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -4257,13 +4257,23 @@ msgstr ""
"<filename>/var/lib/apt/lists/</filename> seront ajoutés à la fin de la liste "
"(après un « <literal>none</literal> » implicite)."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4283,7 +4293,7 @@ msgstr ""
"<filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4306,7 +4316,7 @@ msgstr ""
"Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4321,7 +4331,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4332,7 +4342,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4350,7 +4360,7 @@ msgstr ""
"programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4372,7 +4382,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4390,12 +4400,12 @@ msgstr ""
"est possible d'utiliser la syntaxe des expressions rationnelles."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4406,7 +4416,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4429,7 +4439,7 @@ msgstr ""
"avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4438,7 +4448,7 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4447,7 +4457,7 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4457,12 +4467,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4471,7 +4481,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4482,7 +4492,7 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4495,7 +4505,7 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4511,7 +4521,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4527,7 +4537,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4536,7 +4546,7 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4546,14 +4556,14 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr ""
"utilisation des actions différées (« triggers ») de dpkg (et options "
"associées)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4580,7 +4590,7 @@ msgstr ""
"pendant la configuration des paquets."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4594,7 +4604,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4618,7 +4628,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4641,7 +4651,7 @@ msgstr ""
"options « unpack » et « remove »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4671,7 +4681,7 @@ msgstr ""
"configuré et donc éventuellement non amorçable."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4690,7 +4700,7 @@ msgstr ""
"peut conserver l'option active."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4708,7 +4718,7 @@ msgstr ""
"celles concernant le paquet en cours de traitement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4726,7 +4736,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4752,12 +4762,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4769,12 +4779,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4792,7 +4802,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4803,7 +4813,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4815,7 +4825,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4827,7 +4837,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4836,12 +4846,12 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr "Liste complète des options de débogage de APT :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4849,24 +4859,24 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr "Print information related to downloading packages using HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4875,7 +4885,7 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4884,14 +4894,14 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Décrit le processus de résolution des dépendances pour la construction de "
"paquets source ( « build-dependencies » ) par &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4900,7 +4910,7 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4911,7 +4921,7 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4921,14 +4931,14 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Trace les ajouts et suppressions d'éléments de la queue globale de "
"téléchargement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4938,7 +4948,7 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4948,7 +4958,7 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4958,7 +4968,7 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -4966,7 +4976,7 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -4975,7 +4985,7 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4990,7 +5000,7 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5026,7 +5036,7 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5035,7 +5045,7 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5045,7 +5055,7 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5054,18 +5064,18 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5074,7 +5084,7 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5085,7 +5095,7 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5094,13 +5104,13 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5110,7 +5120,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/it.po b/doc/po/it.po
index 544263d0d..230f85b07 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -74,8 +74,7 @@ msgstr ""
"<!-- Boiler plate Bug reporting section -->\n"
"<!ENTITY manbugs \"\n"
" <refsect1><title>Bug</title>\n"
-" <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bug di "
-"APT</ulink>.\n"
+" <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bug di APT</ulink>.\n"
" Se si desidera segnalare un bug in APT, vedere\n"
" <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o il\n"
" comando &reportbug;.\n"
@@ -98,8 +97,7 @@ msgstr ""
"<!-- Sezione standard autore -->\n"
"<!ENTITY manauthor \"\n"
" <refsect1><title>Autore</title>\n"
-" <para>APT è stato scritto dal Team APT "
-"<email>apt@packages.debian.org</email>.\n"
+" <para>APT è stato scritto dal Team APT <email>apt@packages.debian.org</email>.\n"
" </para>\n"
" </refsect1>\n"
"\">\n"
@@ -167,13 +165,11 @@ msgstr ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
-" <listitem><para>File di configurazione; specifica un file di "
-"configurazione da usare. \n"
+" <listitem><para>File di configurazione; specifica un file di configurazione da usare. \n"
" Il programma legge il file di configurazione predefinito e poi questo \n"
" file di configurazione. Se è necessario modificare le impostazioni di \n"
" configurazione prima che vengano analizzati i file di configurazione \n"
-" predefiniti, specificare un file con la variabile d'ambiente "
-"<envar>APT_CONFIG</envar>. \n"
+" predefiniti, specificare un file con la variabile d'ambiente <envar>APT_CONFIG</envar>. \n"
" Vedere &apt-conf; per informazioni sulla sintassi.\n"
" </para>\n"
" </listitem>\n"
@@ -198,10 +194,8 @@ msgstr ""
" <varlistentry>\n"
" <term><option>-o</option></term>\n"
" <term><option>--option</option></term>\n"
-" <listitem><para>Imposta un'opzione di configurazione; imposterà una "
-"qualunque\n"
-" opzione di configurazione. La sintassi è <option>-o "
-"Pinco::Pallo=pallo</option>.\n"
+" <listitem><para>Imposta un'opzione di configurazione; imposterà una qualunque\n"
+" opzione di configurazione. La sintassi è <option>-o Pinco::Pallo=pallo</option>.\n"
" <option>-o</option> e <option>--option</option> si possono usare più\n"
" volte per impostare opzioni diverse.\n"
" </para>\n"
@@ -227,13 +221,10 @@ msgstr ""
"<!-- Da usare all'interno della sezione opzioni del testo da\n"
" mettere nella pappardella su -h, -v, -c e -o -->\n"
"<!ENTITY apt-cmdblurb \"\n"
-" <para>Tutte le opzioni a riga di comando si possono impostare usando il "
-"file di\n"
-" configurazione; le descrizioni indicano l'opzione da impostare. Per le "
-"opzioni\n"
+" <para>Tutte le opzioni a riga di comando si possono impostare usando il file di\n"
+" configurazione; le descrizioni indicano l'opzione da impostare. Per le opzioni\n"
" booleane si può scavalcare il file di configurazione usando \n"
-"qualcosa come <option>-f-</option>, <option>--no-f</option>, "
-"<option>-f=no</option>\n"
+"qualcosa come <option>-f-</option>, <option>--no-f</option>, <option>-f=no</option>\n"
" o diverse altre varianti.\n"
" </para>\n"
"\">\n"
@@ -251,8 +242,7 @@ msgstr ""
"<!ENTITY file-aptconf \"\n"
" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
" <listitem><para>File di configurazione di APT.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+" Voce di configurazione: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -267,8 +257,7 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
" <listitem><para>Frammenti di file di configurazione di APT.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+" Voce di configurazione: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -284,10 +273,8 @@ msgid ""
msgstr ""
"<!ENTITY file-cachearchives \"\n"
" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
-" <listitem><para>Area di archiviazione per i file dei pacchetti "
-"recuperati.\n"
-" Voce di configurazione: "
-"<literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+" <listitem><para>Area di archiviazione per i file dei pacchetti recuperati.\n"
+" Voce di configurazione: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -300,13 +287,9 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-" "
-"<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
-" <listitem><para>Area di archiviazione per i file dei pacchetti in "
-"transito.\n"
-" Voce di configurazione: <literal>Dir::Cache::Archives</literal> "
-"(<filename>partial</filename> verrà implicitamente aggiunto in fondo al "
-"nome)</para></listitem>\n"
+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+" <listitem><para>Area di archiviazione per i file dei pacchetti in transito.\n"
+" Voce di configurazione: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> verrà implicitamente aggiunto in fondo al nome)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -331,8 +314,7 @@ msgstr ""
" ossia una preferenza a prendere determinati pacchetti\n"
" da una fonte separata\n"
" o da una diversa versione di una distribuzione.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+" Voce di configurazione: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -347,8 +329,7 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>Frammenti di file per le preferenze di versione.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+" Voce di configurazione: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -365,8 +346,7 @@ msgstr ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Posizioni da cui scaricare i pacchetti.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" Voce di configurazione: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -379,12 +359,9 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-" "
-"<varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
-" <listitem><para>Frammenti di file per le posizioni da cui scaricare i "
-"pacchetti.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Frammenti di file per le posizioni da cui scaricare i pacchetti.\n"
+" Voce di configurazione: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -401,11 +378,9 @@ msgid ""
msgstr ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-" <listitem><para>Area di archiviazione per le informazioni sullo stato "
-"di ciascuna risorsa dei pacchetti specificata in\n"
+" <listitem><para>Area di archiviazione per le informazioni sullo stato di ciascuna risorsa dei pacchetti specificata in\n"
" &sources-list;\n"
-" Voce di configurazione: "
-"<literal>Dir::State::Lists</literal>.</para></listitem>\n"
+" Voce di configurazione: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -418,13 +393,9 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-" "
-"<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
-" <listitem><para>Area di archiviazione per le informazioni di stato in "
-"transito.\n"
-" Voce di configurazione: <literal>Dir::State::Lists</literal> "
-"(<filename>partial</filename> verrà implicitamente aggiunto in fondo al "
-"nome)</para></listitem>\n"
+" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+" <listitem><para>Area di archiviazione per le informazioni di stato in transito.\n"
+" Voce di configurazione: <literal>Dir::State::Lists</literal> (<filename>partial</filename> verrà implicitamente aggiunto in fondo al nome)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -440,10 +411,8 @@ msgid ""
msgstr ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-" <listitem><para>Portachiavi delle chiavi fidate locali; qui saranno "
-"aggiunte le nuove chiavi.\n"
-" Voce di configurazione: "
-"<literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" <listitem><para>Portachiavi delle chiavi fidate locali; qui saranno aggiunte le nuove chiavi.\n"
+" Voce di configurazione: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -458,12 +427,9 @@ msgid ""
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-" <listitem><para>Frammenti di file per le chiavi fidate, qui potranno "
-"essere memorizzati\n"
-" ulteriori portachiavi (da parte di altri pacchetti o "
-"dall'amministratore).\n"
-" Voce di configurazione "
-"<literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" <listitem><para>Frammenti di file per le chiavi fidate, qui potranno essere memorizzati\n"
+" ulteriori portachiavi (da parte di altri pacchetti o dall'amministratore).\n"
+" Voce di configurazione <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -480,12 +446,9 @@ msgid ""
"\">\n"
msgstr ""
"<!ENTITY file-extended_states \"\n"
-" "
-"<varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
-" <listitem><para>Elenco degli stati dei pacchetti installati "
-"automaticamente.\n"
-" Voce di configurazione: "
-"<literal>Dir::State::extended_states</literal>.\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+" <listitem><para>Elenco degli stati dei pacchetti installati automaticamente.\n"
+" Voce di configurazione: <literal>Dir::State::extended_states</literal>.\n"
" </para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -498,10 +461,8 @@ msgid ""
" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
"<!ENTITY translation-title \"TRANSLATION\">\n"
msgstr ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
-"comparable\n"
-" to the other headers like NAME and DESCRIPTION and should therefore be "
-"uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
"<!ENTITY translation-title \"TRADUZIONE\">\n"
#. type: Plain text
@@ -517,16 +478,11 @@ msgid ""
" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
"\">\n"
msgstr ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
-"contributed\n"
-" to the translation in the past, who is responsible now and maybe "
-"further information\n"
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
" specially related to your translation. -->\n"
"<!ENTITY translation-holder \"\n"
-" Traduzione in italiano a cura del Team italiano di localizzazione di "
-"Debian <email>debian-l10n-italian@lists.debian.org</email>. In particolare "
-"hanno contribuito Eugenia Franzoni (2000), Hugh Hartmann (2000-2012), "
-"Gabriele Stilli (2012), Beatrice Torracca (2012).\n"
+" Traduzione in italiano a cura del Team italiano di localizzazione di Debian <email>debian-l10n-italian@lists.debian.org</email>. In particolare hanno contribuito Eugenia Franzoni (2000), Hugh Hartmann (2000-2012), Gabriele Stilli (2012), Beatrice Torracca (2012).\n"
"\">\n"
#. type: Plain text
@@ -544,19 +500,13 @@ msgid ""
" translation is lagging behind the original content.\n"
"\">\n"
msgstr ""
-"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
-"untranslated/fuzzy strings\n"
-" in a shipped manpage newer/modified paragraphs will maybe appear in "
-"english in\n"
-" the generated manpage. This sentence is therefore here to tell the "
-"reader that this\n"
-" is not a mistake by the translator - obviously the target is that at "
-"least for stable\n"
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+" the generated manpage. This sentence is therefore here to tell the reader that this\n"
+" is not a mistake by the translator - obviously the target is that at least for stable\n"
" releases this sentence is not needed. :) -->\n"
"<!ENTITY translation-english \"\n"
-" Notare che questa versione tradotta del documento può contenere parti "
-"non tradotte. Ciò è voluto, per evitare di perdere contenuti quando la "
-"traduzione non è aggiornata rispetto all'originale.\n"
+" Notare che questa versione tradotta del documento può contenere parti non tradotte. Ciò è voluto, per evitare di perdere contenuti quando la traduzione non è aggiornata rispetto all'originale.\n"
"\">\n"
#. type: Plain text
@@ -565,9 +515,8 @@ msgid ""
"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
msgstr ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. "
-"-o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
-"\"stringa_config\">"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"stringa_config\">"
#. type: Plain text
#: apt.ent:201
@@ -585,8 +534,8 @@ msgid ""
"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
"\"target_release\">"
msgstr ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. "
-"-t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
"\"rilascio_obiettivo\">"
#. type: Plain text
@@ -613,8 +562,8 @@ msgid ""
"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
msgstr ""
-"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
-"<!ENTITY synopsis-pkg-ver-number \"numero_versione_pacch\">"
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"numero_versione_pacch\">"
#. type: Plain text
#: apt.ent:216
@@ -640,8 +589,8 @@ msgid ""
"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
msgstr ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
-"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"punto_mount_cdrom\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"punto_mount_cdrom\">"
#. type: Plain text
#: apt.ent:225
@@ -670,8 +619,8 @@ msgid ""
"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
msgstr ""
"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
-"packages path override-file pathprefix --> <!ENTITY synopsis-path "
-"\"percorso\">"
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"percorso"
+"\">"
#. type: Plain text
#: apt.ent:234
@@ -761,8 +710,8 @@ msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
msgstr ""
-"A meno che non venga fornita l'opzione <option>-h</option> o "
-"<option>--help</option>, deve essere presente uno dei comandi seguenti."
+"A meno che non venga fornita l'opzione <option>-h</option> o <option>--help</"
+"option>, deve essere presente uno dei comandi seguenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:49
@@ -779,15 +728,14 @@ msgid ""
msgstr ""
"<literal>update</literal> è usato per sincronizzare nuovamente i file degli "
"indici dei pacchetti dalle loro fonti. Gli indici dei pacchetti disponibili "
-"sono scaricati dalle posizioni specificate in "
-"<filename>/etc/apt/sources.list</filename>. Per esempio, quando si usa un "
-"archivio Debian, questo comando recupera e analizza i file "
-"<filename>Packages.gz</filename>, in modo da rendere disponibili "
-"informazioni sui pacchetti nuovi e quelli aggiornati. Si dovrebbe sempre "
-"fare un <literal>update</literal> prima di un <literal>upgrade</literal> o "
-"<literal>dist-upgrade</literal>. Notare che l'indicatore di avanzamento "
-"globale non è preciso perché è impossibile conoscere in anticipo la "
-"dimensione dei file degli indici dei pacchetti."
+"sono scaricati dalle posizioni specificate in <filename>/etc/apt/sources."
+"list</filename>. Per esempio, quando si usa un archivio Debian, questo "
+"comando recupera e analizza i file <filename>Packages.gz</filename>, in modo "
+"da rendere disponibili informazioni sui pacchetti nuovi e quelli aggiornati. "
+"Si dovrebbe sempre fare un <literal>update</literal> prima di un "
+"<literal>upgrade</literal> o <literal>dist-upgrade</literal>. Notare che "
+"l'indicatore di avanzamento globale non è preciso perché è impossibile "
+"conoscere in anticipo la dimensione dei file degli indici dei pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:61
@@ -812,8 +760,8 @@ msgstr ""
"attualmente installati che hanno una nuova versione, ma che non possono "
"essere aggiornati senza cambiare lo stato di installazione di un altro "
"pacchetto, vengono lasciati alla versione attuale. Deve essere prima "
-"effettuato un <literal>update</literal> in modo che <command>apt-"
-"get</command> sappia se sono disponibili nuove versioni dei pacchetti."
+"effettuato un <literal>update</literal> in modo che <command>apt-get</"
+"command> sappia se sono disponibili nuove versioni dei pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:74
@@ -835,11 +783,10 @@ msgstr ""
"get</command> ha un sistema «intelligente» di risoluzione dei conflitti e "
"cerca di aggiornare i pacchetti più importanti a scapito di quelli meno "
"importanti, se necessario. Il comando <literal>dist-upgrade</literal> può "
-"quindi rimuovere alcuni pacchetti. Il file "
-"<filename>/etc/apt/sources.list</filename> contiene un elenco di posizioni "
-"da cui recuperare i file di pacchetto desiderati. Vedere anche &apt-"
-"preferences; per un meccanismo per scavalcare le impostazioni generali per "
-"singoli pacchetti."
+"quindi rimuovere alcuni pacchetti. Il file <filename>/etc/apt/sources.list</"
+"filename> contiene un elenco di posizioni da cui recuperare i file di "
+"pacchetto desiderati. Vedere anche &apt-preferences; per un meccanismo per "
+"scavalcare le impostazioni generali per singoli pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:87
@@ -852,11 +799,11 @@ msgid ""
"new packages)."
msgstr ""
"<literal>dselect-upgrade</literal> viene usato insieme a &dselect;, il "
-"frontend tradizionale per i pacchetti di Debian. <literal>dselect-"
-"upgrade</literal> segue i cambiamenti fatti da &dselect; al campo "
-"<literal>Status</literal> dei pacchetti disponibili, ed effettua le azioni "
-"necessarie per realizzare tale stato (ad esempio la rimozione di vecchi "
-"pacchetti e l'installazione di nuovi)."
+"frontend tradizionale per i pacchetti di Debian. <literal>dselect-upgrade</"
+"literal> segue i cambiamenti fatti da &dselect; al campo <literal>Status</"
+"literal> dei pacchetti disponibili, ed effettua le azioni necessarie per "
+"realizzare tale stato (ad esempio la rimozione di vecchi pacchetti e "
+"l'installazione di nuovi)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:98
@@ -961,8 +908,8 @@ msgstr ""
"pacchetto nel database. Ogni corrispondenza viene quindi installata (o "
"rimossa). Notare che la corrispondenza avviene con sottostringhe, perciò "
"«bass.*» trova corrispondenza con «quanto-bass» e «bassissimo». Se ciò non è "
-"quello che si desidera, ancorare l'espressione regolare con un carattere "
-"«^» o «$», oppure creare un'espressione regolare più specifica."
+"quello che si desidera, ancorare l'espressione regolare con un carattere «^» "
+"o «$», oppure creare un'espressione regolare più specifica."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:151
@@ -1037,9 +984,8 @@ msgstr ""
"Se viene specificata l'opzione <option>--compile</option> allora il "
"pacchetto verrà compilato in un .deb binario usando <command>dpkg-"
"buildpackage</command> per l'architettura così come definita dall'opzione "
-"<command>--host-architecture</command>. Se viene usata l'opzione <option"
-">--download-only</option>, allora il pacchetto sorgente non verrà "
-"spacchettato."
+"<command>--host-architecture</command>. Se viene usata l'opzione <option>--"
+"download-only</option>, allora il pacchetto sorgente non verrà spacchettato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:185
@@ -1054,8 +1000,7 @@ msgstr ""
"nome del sorgente un segno uguale e quindi la versione da scaricare, in modo "
"simile al meccanismo usato per i file di pacchetto. Ciò permette la "
"corrispondenza esatta con il nome e la versione del pacchetto sorgente, "
-"abilitando implicitamente l'opzione <literal>APT::Get::Only-"
-"Source</literal>."
+"abilitando implicitamente l'opzione <literal>APT::Get::Only-Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:191
@@ -1115,13 +1060,12 @@ msgid ""
"disk space."
msgstr ""
"<literal>clean</literal> ripulisce il repository locale dei file di "
-"pacchetto recuperati. Rimuove tutto da "
-"<filename>&cachedir;/archives/</filename> e "
-"<filename>&cachedir;/archives/partial/</filename>, tranne il file di lock. "
-"Quando APT viene usato come metodo per &dselect;, <literal>clean</literal> "
-"viene eseguito automaticamente. Chi non usa dselect probabilmente è bene che "
-"usi <literal>apt-get clean</literal> di quando in quando per liberare "
-"spazio su disco."
+"pacchetto recuperati. Rimuove tutto da <filename>&cachedir;/archives/</"
+"filename> e <filename>&cachedir;/archives/partial/</filename>, tranne il "
+"file di lock. Quando APT viene usato come metodo per &dselect;, "
+"<literal>clean</literal> viene eseguito automaticamente. Chi non usa dselect "
+"probabilmente è bene che usi <literal>apt-get clean</literal> di quando in "
+"quando per liberare spazio su disco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:225
@@ -1168,13 +1112,13 @@ msgid ""
msgstr ""
"<literal>changelog</literal> scarica il changelog di un pacchetto e lo "
"visualizza usando <command>sensible-pager</command>. Il nome e la directory "
-"di base del server sono definiti nella variabile "
-"<literal>APT::Changelogs::Server</literal> (ad esempio <ulink url=\"http://pa"
-"ckages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> per "
-"Debian o <ulink url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubu"
-"ntu.com/changelogs</ulink> per Ubuntu). In modo predefinito visualizza il "
-"changelog per la versione che è installata. Tuttavia si possono specificare "
-"le stesse opzioni del comando <option>install</option>."
+"di base del server sono definiti nella variabile <literal>APT::Changelogs::"
+"Server</literal> (ad esempio <ulink url=\"http://packages.debian.org/"
+"changelogs\">packages.debian.org/changelogs</ulink> per Debian o <ulink url="
+"\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+"changelogs</ulink> per Ubuntu). In modo predefinito visualizza il changelog "
+"per la versione che è installata. Tuttavia si possono specificare le stesse "
+"opzioni del comando <option>install</option>."
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:258 apt-cache.8.xml:248 apt-mark.8.xml:108
@@ -1190,8 +1134,8 @@ msgid ""
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
"Non considerare i pacchetti raccomandati come una dipendenza per "
-"l'installazione. Voce di configurazione: <literal>APT::Install-"
-"Recommends</literal>."
+"l'installazione. Voce di configurazione: <literal>APT::Install-Recommends</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:268
@@ -1209,8 +1153,8 @@ msgid ""
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
"Scarica solamente; i file di pacchetto sono solo recuperati e non "
-"spacchettati o installati. Voce di configurazione: <literal>APT::Get"
-"::Download-Only</literal>."
+"spacchettati o installati. Voce di configurazione: <literal>APT::Get::"
+"Download-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:278
@@ -1267,8 +1211,8 @@ msgid ""
"missing</option> to force APT to use only the .debs it has already "
"downloaded. Configuration Item: <literal>APT::Get::Download</literal>."
msgstr ""
-"Disabilita lo scaricamento dei pacchetti. È usato al meglio con <option"
-">--ignore-missing</option> per forzare APT ad usare solo i .deb che ha già "
+"Disabilita lo scaricamento dei pacchetti. È usato al meglio con <option>--"
+"ignore-missing</option> per forzare APT ad usare solo i .deb che ha già "
"scaricato. Voce di configurazione: <literal>APT::Get::Download</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1286,11 +1230,10 @@ msgstr ""
"indicatori di avanzamento. L'uso di più «q» produce un output più silenzioso "
"fino a un massimo di 2. Si può anche usare <option>-q=n</option> per "
"impostare il livello di silenziosità a n, scavalcando il file di "
-"configurazione. Notare che il livello di silenziosità 2 implica "
-"<option>-y</option>; non si dovrebbe mai usare -qq senza un modificatore che "
-"non fa azioni come -d, --print-uris o -s, dato che APT potrebbe decidere di "
-"fare qualcosa di inatteso. Voce di configurazione: "
-"<literal>quiet</literal>."
+"configurazione. Notare che il livello di silenziosità 2 implica <option>-y</"
+"option>; non si dovrebbe mai usare -qq senza un modificatore che non fa "
+"azioni come -d, --print-uris o -s, dato che APT potrebbe decidere di fare "
+"qualcosa di inatteso. Voce di configurazione: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:326
@@ -1318,8 +1261,8 @@ msgstr ""
"il lock (<literal>Debug::NoLocking</literal>) e se è impostata l'opzione "
"<literal>APT::Get::Show-User-Simulation-Note</literal> (come predefinito), "
"viene anche visualizzato un messaggio che indica che quella fatta è solo una "
-"simulazione. Le esecuzioni effettuate da root non attivano né NoLocking né "
-"i messaggi: i superutenti dovrebbero sapere ciò che stanno facendo senza "
+"simulazione. Le esecuzioni effettuate da root non attivano né NoLocking né i "
+"messaggi: i superutenti dovrebbero sapere ciò che stanno facendo senza "
"bisogno di ulteriori avvertimenti da <literal>apt-get</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1352,8 +1295,8 @@ msgstr ""
"situazione non desiderabile, come il cambiamento di un pacchetto bloccato, "
"il tentativo di installazione di un pacchetto non autenticato o la rimozione "
"di un pacchetto essenziale, allora <literal>apt-get</literal> annullerà "
-"l'esecuzione. Voce di configurazione: <literal>APT::Get::Assume-"
-"Yes</literal>."
+"l'esecuzione. Voce di configurazione: <literal>APT::Get::Assume-Yes</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:354
@@ -1394,12 +1337,11 @@ msgid ""
"Architecture</literal>"
msgstr ""
"Questa opzione controlla l'architettura per la quale <command>apt-get source "
-"--compile</command> compila i pacchetti e come le dipendenze di "
-"compilazione incrociata sono soddisfatte. In modo predefinito non è "
-"impostata, il che significa che l'architettura ospite è la stessa "
-"dell'architettura di compilazione (che è definita da "
-"<literal>APT::Architecture</literal>). Voce di configurazione: "
-"<literal>APT::Get::Host-Architecture</literal>."
+"--compile</command> compila i pacchetti e come le dipendenze di compilazione "
+"incrociata sono soddisfatte. In modo predefinito non è impostata, il che "
+"significa che l'architettura ospite è la stessa dell'architettura di "
+"compilazione (che è definita da <literal>APT::Architecture</literal>). Voce "
+"di configurazione: <literal>APT::Get::Host-Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:381
@@ -1419,9 +1361,9 @@ msgid ""
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
msgstr ""
"Ignora i blocchi sui pacchetti; ciò fa sì che <command>apt-get</command> "
-"ignori il blocco posto su un pacchetto. Può essere utile insieme a <literal"
-">dist-upgrade</literal> per scavalcare un grande numero di blocchi non "
-"desiderati. Voce di configurazione: <literal>APT::Ignore-Hold</literal>."
+"ignori il blocco posto su un pacchetto. Può essere utile insieme a "
+"<literal>dist-upgrade</literal> per scavalcare un grande numero di blocchi "
+"non desiderati. Voce di configurazione: <literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:393
@@ -1431,10 +1373,10 @@ msgid ""
"line from being upgraded if they are already installed. Configuration Item: "
"<literal>APT::Get::Upgrade</literal>."
msgstr ""
-"Non aggiornare i pacchetti; quando usato insieme a "
-"<literal>install</literal>, <literal>no-upgrade</literal> impedisce che i "
-"pacchetti nella riga di comando vengano aggiornati se sono già installati. "
-"Voce di configurazione: <literal>APT::Get::Upgrade</literal>."
+"Non aggiornare i pacchetti; quando usato insieme a <literal>install</"
+"literal>, <literal>no-upgrade</literal> impedisce che i pacchetti nella riga "
+"di comando vengano aggiornati se sono già installati. Voce di "
+"configurazione: <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:400
@@ -1444,10 +1386,10 @@ msgid ""
"installed packages only and ignore requests to install new packages. "
"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
msgstr ""
-"Non installare nuovi pacchetti; quando usato insieme a "
-"<literal>install</literal>, <literal>only-upgrade</literal> installa gli "
-"aggiornamenti solamente per i pacchetti già installati e ignora le richieste "
-"di installarne di nuovi. Voce di configurazione: <literal>APT::Get::Only-"
+"Non installare nuovi pacchetti; quando usato insieme a <literal>install</"
+"literal>, <literal>only-upgrade</literal> installa gli aggiornamenti "
+"solamente per i pacchetti già installati e ignora le richieste di "
+"installarne di nuovi. Voce di configurazione: <literal>APT::Get::Only-"
"Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1496,10 +1438,9 @@ msgid ""
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
"Usa purge invece di remove per ogni cosa da rimuovere. Verrà visualizzato un "
-"asterisco («*») vicino ai pacchetti pianificati per l'eliminazione "
-"completa. <option>remove --purge</option> è equivalente al comando "
-"<option>purge</option>. Voce di configurazione: "
-"<literal>APT::Get::Purge</literal>."
+"asterisco («*») vicino ai pacchetti pianificati per l'eliminazione completa. "
+"<option>remove --purge</option> è equivalente al comando <option>purge</"
+"option>. Voce di configurazione: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:435
@@ -1521,12 +1462,11 @@ msgid ""
"List-Cleanup</literal>."
msgstr ""
"Questa opzione è attivata in modo predefinito; usare <literal>--no-list-"
-"cleanup</literal> per disabilitarla. Quando è attivata <command>apt-"
-"get</command> gestisce automaticamente il contenuto di "
-"<filename>&statedir;/lists</filename> per garantire che i file obsoleti "
-"siano eliminati. L'unica ragione per disabilitarla è se si cambia di "
-"frequente la propria lista di fonti. Voce di configurazione: "
-"<literal>APT::Get::List-Cleanup</literal>."
+"cleanup</literal> per disabilitarla. Quando è attivata <command>apt-get</"
+"command> gestisce automaticamente il contenuto di <filename>&statedir;/"
+"lists</filename> per garantire che i file obsoleti siano eliminati. L'unica "
+"ragione per disabilitarla è se si cambia di frequente la propria lista di "
+"fonti. Voce di configurazione: <literal>APT::Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:450
@@ -1543,14 +1483,14 @@ msgid ""
msgstr ""
"Questa opzione controlla l'input predefinito per il motore delle politiche; "
"crea un pin predefinito alla priorità 990 usando la stringa di rilascio "
-"specificata. Ciò scavalca le impostazioni generali in "
-"<filename>/etc/apt/preferences</filename>. Questa opzione non ha effetto sui "
-"pacchetti su cui si usa specificatamente il pinning. In breve, questa "
-"opzione permette di avere un semplice controllo sulla distribuzione da cui "
-"verranno recuperati i pacchetti. Alcuni esempi comuni possono essere "
-"<option>-t '2.1*'</option>, <option>-t unstable</option> o <option>-t "
-"sid</option>. Voce di configurazione: <literal>APT::Default-"
-"Release</literal>; vedere anche la pagina di manuale di &apt-preferences;."
+"specificata. Ciò scavalca le impostazioni generali in <filename>/etc/apt/"
+"preferences</filename>. Questa opzione non ha effetto sui pacchetti su cui "
+"si usa specificatamente il pinning. In breve, questa opzione permette di "
+"avere un semplice controllo sulla distribuzione da cui verranno recuperati i "
+"pacchetti. Alcuni esempi comuni possono essere <option>-t '2.1*'</option>, "
+"<option>-t unstable</option> o <option>-t sid</option>. Voce di "
+"configurazione: <literal>APT::Default-Release</literal>; vedere anche la "
+"pagina di manuale di &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:465
@@ -1561,10 +1501,10 @@ msgid ""
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
"Effettua solo le operazioni che sono «banali». Può essere correlato "
-"logicamente a <option>--assume-yes</option>: mentre <option>--assume-"
-"yes</option> risponde «sì» a tutti i prompt, <option>--trivial-only</option> "
-"risponde «no». Voce di configurazione: <literal>APT::Get::Trivial-"
-"Only</literal>."
+"logicamente a <option>--assume-yes</option>: mentre <option>--assume-yes</"
+"option> risponde «sì» a tutti i prompt, <option>--trivial-only</option> "
+"risponde «no». Voce di configurazione: <literal>APT::Get::Trivial-Only</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:472
@@ -1573,8 +1513,8 @@ msgid ""
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
"Se un qualsiasi pacchetto dovrebbe essere rimosso, apt-get immediatamente "
-"annulla l'operazione senza chiedere. Voce di configurazione: "
-"<literal>APT::Get::Remove</literal>."
+"annulla l'operazione senza chiedere. Voce di configurazione: <literal>APT::"
+"Get::Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:478
@@ -1587,8 +1527,8 @@ msgstr ""
"Se il comando è <literal>install</literal> oppure <literal>remove</literal>, "
"allora questa opzione si comporta come se si eseguisse il comando "
"<literal>autoremove</literal>, rimuovendo i pacchetti di dipendenza non "
-"utilizzati. Voce di configurazione: "
-"<literal>APT::Get::AutomaticRemove</literal>."
+"utilizzati. Voce di configurazione: <literal>APT::Get::AutomaticRemove</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:485
@@ -1601,9 +1541,9 @@ msgid ""
"corresponding source package. Configuration Item: <literal>APT::Get::Only-"
"Source</literal>."
msgstr ""
-"Ha significato solo per i comandi <literal>source</literal> e <literal"
-">build-dep</literal>. Indica che i nomi dei sorgenti indicati non devono "
-"essere mappati usando la tabella dei binari; ciò significa che, se viene "
+"Ha significato solo per i comandi <literal>source</literal> e <literal>build-"
+"dep</literal>. Indica che i nomi dei sorgenti indicati non devono essere "
+"mappati usando la tabella dei binari; ciò significa che, se viene "
"specificata questa opzione, tali comandi accetteranno solamente nomi di "
"pacchetti sorgente come argomento, invece di accettare nomi di pacchetti "
"binari e cercare il pacchetto sorgente corrispondente. Voce di "
@@ -1617,8 +1557,8 @@ msgid ""
"literal>, and <literal>APT::Get::Tar-Only</literal>."
msgstr ""
"Scarica solo il file diff, dsc o tar di un archivio sorgente. Voce di "
-"configurazione: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get"
-"::Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>."
+"configurazione: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
+"Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:502
@@ -1642,14 +1582,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "File"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -1663,8 +1603,8 @@ msgid ""
"preferences;, the APT Howto."
msgstr ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, la Guida dell'utente di APT in &guidesdir;, "
-"&apt-preferences;, l'APT Howto."
+"&apt-config;, &apt-secure;, la Guida dell'utente di APT in &guidesdir;, &apt-"
+"preferences;, l'APT Howto."
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
@@ -1781,9 +1721,9 @@ msgstr ""
"ncurses3.0 che devono essere installati affinché libreadline2 funzioni. A "
"loro volta, libreadlineg2 e libreadline2-altdev dipendono da libreadline2. "
"Se libreadline2 è installato, devono esserlo anche libc5 e ncurses3.0 (e "
-"ldso); non necessariamente devono esserlo libreadlineg2 e "
-"libreadline2-altdev. Per il significato specifico del resto dell'output è "
-"meglio consultare il codice sorgente di apt."
+"ldso); non necessariamente devono esserlo libreadlineg2 e libreadline2-"
+"altdev. Per il significato specifico del resto dell'output è meglio "
+"consultare il codice sorgente di apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:87
@@ -1971,8 +1911,8 @@ msgstr ""
"stampa il nome e la descrizione breve dei pacchetti, inclusi quelli "
"virtuali. Se viene fornita l'opzione <option>--full</option>, per ciascun "
"pacchetto che soddisfa la ricerca viene prodotto un output identico a quello "
-"di <literal>show</literal>; se viene fornita l'opzione <option>--names-"
-"only</option> la ricerca viene fatta solo sul nome del pacchetto e non sulla "
+"di <literal>show</literal>; se viene fornita l'opzione <option>--names-only</"
+"option> la ricerca viene fatta solo sul nome del pacchetto e non sulla "
"descrizione lunga."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2048,13 +1988,13 @@ msgid ""
msgstr ""
"<literal>dotty</literal> accetta un elenco di pacchetti dalla riga di "
"comando e genera un output adatto all'uso da parte di dotty del pacchetto "
-"<ulink "
-"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. Il "
-"risultato sarà un insieme di nodi e linee che rappresentano le relazioni fra "
-"i pacchetti. In modo predefinito dai pacchetti dati si risalirà a tutti i "
-"pacchetti delle dipendenze; ciò può produrre un grafo molto grande. Per "
-"limitare il risultato ai soli pacchetti elencati sulla riga di comando, "
-"impostare l'opzione <literal>APT::Cache::GivenOnly</literal>."
+"<ulink url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</"
+"ulink>. Il risultato sarà un insieme di nodi e linee che rappresentano le "
+"relazioni fra i pacchetti. In modo predefinito dai pacchetti dati si "
+"risalirà a tutti i pacchetti delle dipendenze; ciò può produrre un grafo "
+"molto grande. Per limitare il risultato ai soli pacchetti elencati sulla "
+"riga di comando, impostare l'opzione <literal>APT::Cache::GivenOnly</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:216
@@ -2083,9 +2023,9 @@ msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
msgstr ""
-"Stessa cosa di <literal>dotty</literal>, ma per xvcg dello <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">strumento "
-"VCG</ulink>."
+"Stessa cosa di <literal>dotty</literal>, ma per xvcg dello <ulink url="
+"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">strumento VCG</"
+"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:229
@@ -2161,10 +2101,9 @@ msgid ""
msgstr ""
"Silenzioso; produce un output adatto per un file di registro, omettendo gli "
"indicatori di avanzamento. Ulteriori q produrranno un risultato ancor più "
-"silenzioso, fino a un massimo di 2. È anche possibile usare "
-"<option>-q=n</option> per impostare il livello di silenziosità a n, "
-"scavalcando il file di configurazione. Voce di configurazione: "
-"<literal>quiet</literal>."
+"silenzioso, fino a un massimo di 2. È anche possibile usare <option>-q=n</"
+"option> per impostare il livello di silenziosità a n, scavalcando il file di "
+"configurazione. Voce di configurazione: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:274
@@ -2175,8 +2114,8 @@ msgid ""
msgstr ""
"Stampa solo le dipendenze importanti; da usarsi con <literal>unmet</literal> "
"e <literal>depends</literal>. Fa sì che vengano stampate solo le relazioni "
-"Depends e Pre-Depends. Voce di configurazione: "
-"<literal>APT::Cache::Important</literal>."
+"Depends e Pre-Depends. Voce di configurazione: <literal>APT::Cache::"
+"Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:288
@@ -2189,9 +2128,9 @@ msgid ""
msgstr ""
"In modo predefinito <literal>depends</literal> e <literal>rdepends</literal> "
"stampano tutte le dipendenze. Ciò può essere modificato con queste opzioni "
-"che omettono il tipo specificato di dipendenza. Voce di configurazione <lite"
-"ral>APT::Cache::Show<replaceable>TipoDipendenza</replaceable></literal>, ad "
-"es. <literal>APT::Cache::ShowRecommends</literal>."
+"che omettono il tipo specificato di dipendenza. Voce di configurazione "
+"<literal>APT::Cache::Show<replaceable>TipoDipendenza</replaceable></"
+"literal>, ad es. <literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:295
@@ -2217,8 +2156,8 @@ msgstr ""
"versions</option>. Se si specifica <option>--no-all-versions</option>, verrà "
"visualizzata solo la versione candidata (quella che sarebbe scelta per "
"l'installazione). Questa opzione è applicabile solo al comando "
-"<literal>show</literal>. Voce di configurazione: "
-"<literal>APT::Cache::AllVersions</literal>."
+"<literal>show</literal>. Voce di configurazione: <literal>APT::Cache::"
+"AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:309
@@ -2271,8 +2210,8 @@ msgid ""
"<literal>APT::Cache::Installed</literal>."
msgstr ""
"Limita l'output di <literal>depends</literal> e <literal>rdepends</literal> "
-"ai pacchetti attualmente installati. Voce di configurazione: "
-"<literal>APT::Cache::Installed</literal>."
+"ai pacchetti attualmente installati. Voce di configurazione: <literal>APT::"
+"Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><para>
#: apt-cache.8.xml:351
@@ -2328,7 +2267,8 @@ msgstr "Rimuove una chiave dall'elenco delle chiavi fidate."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:74
msgid "Output the key &synopsis-param-keyid; to standard output."
-msgstr "Visualizza sullo standard output l'&synopsis-param-keyid; della chiave."
+msgstr ""
+"Visualizza sullo standard output l'&synopsis-param-keyid; della chiave."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:85
@@ -2365,8 +2305,8 @@ msgid ""
msgstr ""
"Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove "
"dal portachiavi locale le chiavi di archivio che non sono più valide. Il "
-"portachiavi degli archivi è fornito nel pacchetto <literal>archive-"
-"keyring</literal> delle diverse distribuzioni, ad esempio il pacchetto "
+"portachiavi degli archivi è fornito nel pacchetto <literal>archive-keyring</"
+"literal> delle diverse distribuzioni, ad esempio il pacchetto "
"<literal>debian-archive-keyring</literal> in Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2414,9 +2354,9 @@ msgstr ""
"Con questa opzione è possibile specificare un particolare file portachiavi "
"su cui deve operare il comando. Il comportamento predefinito esegue i "
"comandi sul file <filename>trusted.gpg</filename>, così come su tutte le "
-"parti nella directory <filename>trusted.gpg.d</filename>; "
-"<filename>trusted.gpg</filename> è però il portachiavi primario il che "
-"significa, ad esempio, che le nuove chiavi sono aggiunte ad esso."
+"parti nella directory <filename>trusted.gpg.d</filename>; <filename>trusted."
+"gpg</filename> è però il portachiavi primario il che significa, ad esempio, "
+"che le nuove chiavi sono aggiunte ad esso."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:179
@@ -2458,7 +2398,8 @@ msgstr "&apt-get;, &apt-secure;"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-mark.8.xml:33
msgid "mark/unmark a package as being automatically-installed"
-msgstr "mette/toglie il contrassegno di automaticamente installato ai pacchetti"
+msgstr ""
+"mette/toglie il contrassegno di automaticamente installato ai pacchetti"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:39
@@ -2479,11 +2420,11 @@ msgid ""
"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
"Quando viene richiesta l'installazione di un pacchetto e ciò fa sì che altri "
-"pacchetti vengano installati per soddisfare le sue dipendenze, queste "
-"ultime sono contrassegnate come installate automaticamente. Una volta che "
-"non c'è più alcun pacchetto installato manualmente che dipende da questi "
-"pacchetti installati automaticamente, essi vengono rimossi, ad esempio da "
-"<command>apt-get</command> o <command>aptitude</command>."
+"pacchetti vengano installati per soddisfare le sue dipendenze, queste ultime "
+"sono contrassegnate come installate automaticamente. Una volta che non c'è "
+"più alcun pacchetto installato manualmente che dipende da questi pacchetti "
+"installati automaticamente, essi vengono rimossi, ad esempio da <command>apt-"
+"get</command> o <command>aptitude</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:52
@@ -2617,10 +2558,10 @@ msgid ""
msgstr ""
"Se un pacchetto proviene da un archivio senza una firma, o con una firma per "
"la quale apt non ha una chiave, tale pacchetto viene considerato non fidato "
-"e quando lo si installa si ottiene un importante avvertimento. <command"
-">apt-get</command> attualmente avverte solamente in caso di archivi non "
-"firmati; le versioni future potrebbero forzare la verifica di tutte le fonti "
-"prima di scaricare pacchetti da esse."
+"e quando lo si installa si ottiene un importante avvertimento. <command>apt-"
+"get</command> attualmente avverte solamente in caso di archivi non firmati; "
+"le versioni future potrebbero forzare la verifica di tutte le fonti prima di "
+"scaricare pacchetti da esse."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:69
@@ -2715,8 +2656,8 @@ msgid ""
msgstr ""
"Gli utenti finali possono controllare la firma del file Release, estrarre da "
"esso il codice di controllo di un pacchetto e confrontarlo con il codice di "
-"controllo del pacchetto che hanno scaricato a mano, oppure possono "
-"affidarsi ad APT che lo fa automaticamente."
+"controllo del pacchetto che hanno scaricato a mano, oppure possono affidarsi "
+"ad APT che lo fa automaticamente."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:118
@@ -2765,8 +2706,8 @@ msgid ""
msgstr ""
"Tuttavia non difende dalle compromissioni del server principale Debian "
"stesso (che firma i pacchetti) o dalla compromissione della chiave usata per "
-"firmare i file Release. In ogni caso, questo meccanismo può complementare "
-"le firme a livello di singolo pacchetto."
+"firmare i file Release. In ogni caso, questo meccanismo può complementare le "
+"firme a livello di singolo pacchetto."
#. type: Content of: <refentry><refsect1><title>
#: apt-secure.8.xml:144
@@ -2801,8 +2742,8 @@ msgstr ""
"dovrebbe assicurare di usare un canale di comunicazione fidato quando la si "
"recupera), aggiungerla con <command>apt-key</command> e poi eseguire "
"<command>apt-get update</command>, in modo che apt possa scaricare e "
-"verificare i file <filename>InRelease</filename> o "
-"<filename>Release.gpg</filename> dagli archivi che sono configurati."
+"verificare i file <filename>InRelease</filename> o <filename>Release.gpg</"
+"filename> dagli archivi che sono configurati."
#. type: Content of: <refentry><refsect1><title>
#: apt-secure.8.xml:162
@@ -2826,8 +2767,8 @@ msgid ""
"command> (provided in apt-utils)."
msgstr ""
"<emphasis>Creare un file Release di livello più alto</emphasis>, se non "
-"esiste già. Lo si può fare eseguendo <command>apt-ftparchive "
-"release</command> (fornito in apt-utils)."
+"esiste già. Lo si può fare eseguendo <command>apt-ftparchive release</"
+"command> (fornito in apt-utils)."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:174
@@ -2836,9 +2777,9 @@ msgid ""
"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
"gpg Release</command>."
msgstr ""
-"<emphasis>Firmarlo</emphasis>. Lo si può fare eseguendo <command>gpg "
-"--clearsign -o InRelease Release</command> e <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>Firmarlo</emphasis>. Lo si può fare eseguendo <command>gpg --"
+"clearsign -o InRelease Release</command> e <command>gpg -abs -o Release.gpg "
+"Release</command>."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:178
@@ -2884,8 +2825,8 @@ msgstr ""
"Per maggiori informazioni sui concetti alla base di questo sistema, si può "
"leggere il capitolo <ulink url=\"http://www.debian.org/doc/manuals/securing-"
"debian-howto/ch7\">Debian Security Infrastructure</ulink> del manuale "
-"Securing Debian (disponibile anche nel pacchetto harden-doc) e il <ulink "
-"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+"Securing Debian (disponibile anche nel pacchetto harden-doc) e il <ulink url="
+"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
"Distribution HOWTO</ulink> di V. Alex Brennen."
#. type: Content of: <refentry><refsect1><title>
@@ -2927,10 +2868,10 @@ msgid ""
"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
-"Per aggiungere dei CD al sistema APT è necessario usare <command>apt-"
-"cdrom</command>, in quanto ciò non può essere fatto manualmente. Inoltre "
-"ogni disco in un insieme di più CD deve essere inserito e scansionato "
-"separatamente per tenere conto di possibili errori di masterizzazione."
+"Per aggiungere dei CD al sistema APT è necessario usare <command>apt-cdrom</"
+"command>, in quanto ciò non può essere fatto manualmente. Inoltre ogni disco "
+"in un insieme di più CD deve essere inserito e scansionato separatamente per "
+"tenere conto di possibili errori di masterizzazione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:56
@@ -2976,8 +2917,8 @@ msgid ""
msgstr ""
"Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo "
"punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> "
-"e configurato correttamente. Voce di configurazione: "
-"<literal>Acquire::cdrom::mount</literal>."
+"e configurato correttamente. Voce di configurazione: <literal>Acquire::"
+"cdrom::mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:94
@@ -2988,8 +2929,8 @@ msgid ""
msgstr ""
"Rinomina un disco; cambia l'etichetta di un disco o soppianta l'etichetta "
"originale del disco. Questa opzione farà sì che <command>apt-cdrom</command> "
-"chieda una nuova etichetta. Voce di configurazione: "
-"<literal>APT::CDROM::Rename</literal>."
+"chieda una nuova etichetta. Voce di configurazione: <literal>APT::CDROM::"
+"Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:103
@@ -2999,8 +2940,8 @@ msgid ""
"NoMount</literal>."
msgstr ""
"Non montare; impedisce ad <command>apt-cdrom</command> di montare e smontare "
-"il punto di mount. Voce di configurazione: "
-"<literal>APT::CDROM::NoMount</literal>."
+"il punto di mount. Voce di configurazione: <literal>APT::CDROM::NoMount</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:111
@@ -3105,8 +3046,8 @@ msgid ""
"options with a default of <option>-f</option>."
msgstr ""
"In questo modo la variabile d'ambiente $OPZIONI della shell verrà impostata "
-"al valore di MiaApp::opzioni con un valore predefinito di "
-"<option>-f</option>."
+"al valore di MiaApp::opzioni con un valore predefinito di <option>-f</"
+"option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-config.8.xml:68
@@ -3154,8 +3095,8 @@ msgstr ""
"nel valore verranno codificati per assicurare che possano essere usati senza "
"problemi in una stringa tra virgolette, come definito nella RFC822. In "
"aggiunta &percnt;n verrà sostituito da un ritorno a capo e &percnt;N da una "
-"tabulazione. Un carattere &percnt; può essere prodotto usando "
-"&percnt;&percnt;. "
+"tabulazione. Un carattere &percnt; può essere prodotto usando &percnt;"
+"&percnt;. "
#. type: Content of: <refentry><refsect1><para>
#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-sortpkgs.1.xml:64
@@ -3236,21 +3177,21 @@ msgid ""
"be silently ignored."
msgstr ""
"tutti i file in <literal>Dir::Etc::Parts</literal>, in ordine alfanumerico "
-"crescente, se il loro nome file non ha estensione o ha "
-"«<literal>conf</literal>» come estensione, e contiene solamente caratteri "
-"alfanumerici, trattini (-), caratteri di sottolineatura (_) e punti (.). "
-"Altrimenti, APT visualizza un messaggio che informa che un file è stato "
-"ignorato, a meno che il file non corrisponda ad un modello nell'elenco di "
-"configurazione <literal>Dir::Ignore-Files-Silently</literal> nel qual caso "
-"verrà ignorato silenziosamente."
+"crescente, se il loro nome file non ha estensione o ha «<literal>conf</"
+"literal>» come estensione, e contiene solamente caratteri alfanumerici, "
+"trattini (-), caratteri di sottolineatura (_) e punti (.). Altrimenti, APT "
+"visualizza un messaggio che informa che un file è stato ignorato, a meno che "
+"il file non corrisponda ad un modello nell'elenco di configurazione "
+"<literal>Dir::Ignore-Files-Silently</literal> nel qual caso verrà ignorato "
+"silenziosamente."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:59
msgid ""
"the main configuration file specified by <literal>Dir::Etc::main</literal>"
msgstr ""
-"il file di configurazione principale specificato da "
-"<literal>Dir::Etc::main</literal>"
+"il file di configurazione principale specificato da <literal>Dir::Etc::main</"
+"literal>"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:61
@@ -3299,8 +3240,8 @@ msgstr ""
"quello usato dagli strumenti ISC come bind e dhcp. Le righe che iniziano con "
"<literal>//</literal> vengono trattate come commenti (ignorate), così come "
"tutto il testo racchiuso tra <literal>/*</literal> e <literal>*/</literal>, "
-"proprio come i commenti C/C++. Ogni riga ha la forma <literal>APT::Get"
-"::Assume-Yes \"true\";</literal>. Le virgolette e il punto e virgola finale "
+"proprio come i commenti C/C++. Ogni riga ha la forma <literal>APT::Get::"
+"Assume-Yes \"true\";</literal>. Le virgolette e il punto e virgola finale "
"sono obbligatori. I valori non possono includere barre inverse (\\) o "
"ulteriori virgolette. I nomi delle opzioni sono costituiti da caratteri "
"alfanumerici e dai caratteri «/-:._+». Un nuovo ambito può essere aperto con "
@@ -3349,9 +3290,9 @@ msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
msgstr ""
-"In generale i file di configurazione d'esempio in "
-"<filename>&docdir;examples/apt.conf</filename> e &configureindex; sono una "
-"buona guida su come debba essere un file di configurazione."
+"In generale i file di configurazione d'esempio in <filename>&docdir;examples/"
+"apt.conf</filename> e &configureindex; sono una buona guida su come debba "
+"essere un file di configurazione."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:105
@@ -3373,11 +3314,10 @@ msgid ""
"any other option by reassigning a new value to the option."
msgstr ""
"I nomi delle voci di configurazione sono opzionali se viene definito un "
-"elenco come si può vedere nell'esempio <literal>DPkg::Pre-Install-"
-"Pkgs</literal> precedente. Se non si specifica un nome, una nuova voce "
-"aggiunge semplicemente una nuova opzione all'elenco. Se si specifica un "
-"nome, si può sovrascrivere l'opzione come per ogni altra, assegnandole un "
-"nuovo valore."
+"elenco come si può vedere nell'esempio <literal>DPkg::Pre-Install-Pkgs</"
+"literal> precedente. Se non si specifica un nome, una nuova voce aggiunge "
+"semplicemente una nuova opzione all'elenco. Se si specifica un nome, si può "
+"sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:113
@@ -3428,8 +3368,8 @@ msgid ""
msgstr ""
"Tutti gli strumenti APT accettano un'opzione -o che permette di specificare "
"una direttiva di configurazione arbitraria nella riga di comando. La "
-"sintassi è un nome completo di opzione (per esempio <literal>APT::Get"
-"::Assume-Yes</literal>) seguito da un segno di uguaglianza e quindi il nuovo "
+"sintassi è un nome completo di opzione (per esempio <literal>APT::Get::"
+"Assume-Yes</literal>) seguito da un segno di uguaglianza e quindi il nuovo "
"valore dell'opzione. Per aggiungere un nuovo elemento ad un elenco, "
"aggiungere <literal>::</literal> alla fine del nome dell'elenco. (Come si "
"può immaginare, la sintassi per gli ambiti non può essere usata nella riga "
@@ -3453,18 +3393,17 @@ msgid ""
msgstr ""
"Notare che aggiungere voci in coda ad un elenco usando <literal>::</literal> "
"funziona solamente con un elemento per riga, e che non si dovrebbe usarlo "
-"insieme alla sintassi per gli ambiti (che aggiunge implicitamente "
-"<literal>::</literal>). L'uso di entrambe le sintassi insieme fa apparire un "
-"bug che sfortunatamente alcuni utenti utilizzano: un'opzione con l'insolito "
-"nome «<literal>::</literal>» che funziona come una qualsiasi altra opzione "
-"con nome. Ciò introduce molti problemi; innanzitutto gli utenti che scrivono "
-"più righe con questa sintassi <emphasis>sbagliata</emphasis> nella speranza "
-"di aggiungere voci ad un elenco ottengono il risultato opposto, dato che "
-"viene usata solo l'ultima assegnazione per questa opzione "
-"«<literal>::</literal>». Le versioni future di APT causeranno errori e "
-"smetteranno di funzionare se incontrano questo uso scorretto, perciò è bene "
-"correggere tali dichiarazioni ora, quando APT ancora non si lamenta "
-"esplicitamente."
+"insieme alla sintassi per gli ambiti (che aggiunge implicitamente <literal>::"
+"</literal>). L'uso di entrambe le sintassi insieme fa apparire un bug che "
+"sfortunatamente alcuni utenti utilizzano: un'opzione con l'insolito nome "
+"«<literal>::</literal>» che funziona come una qualsiasi altra opzione con "
+"nome. Ciò introduce molti problemi; innanzitutto gli utenti che scrivono più "
+"righe con questa sintassi <emphasis>sbagliata</emphasis> nella speranza di "
+"aggiungere voci ad un elenco ottengono il risultato opposto, dato che viene "
+"usata solo l'ultima assegnazione per questa opzione «<literal>::</literal>». "
+"Le versioni future di APT causeranno errori e smetteranno di funzionare se "
+"incontrano questo uso scorretto, perciò è bene correggere tali dichiarazioni "
+"ora, quando APT ancora non si lamenta esplicitamente."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:154
@@ -3506,13 +3445,12 @@ msgstr ""
"Tutte le architetture supportate dal sistema. Ad esempio, le CPU che "
"implementano l'insieme di istruzioni <literal>amd64</literal> (chiamato "
"anche <literal>x86-64</literal>) sono anche in grado di eseguire binari "
-"compilati per l'insieme di istruzioni <literal>i386</literal> "
-"(<literal>x86</literal>). Questo elenco viene usato quando si recuperano i "
-"file e si analizzano gli elenchi dei pacchetti. Il valore iniziale "
-"predefinito è sempre l'architettura nativa del sistema "
-"(<literal>APT::Architecture</literal>), e le altre architetture vengono "
-"aggiunte all'elenco predefinito quando sono registrate con <command>dpkg "
-"--add-architecture</command>."
+"compilati per l'insieme di istruzioni <literal>i386</literal> (<literal>x86</"
+"literal>). Questo elenco viene usato quando si recuperano i file e si "
+"analizzano gli elenchi dei pacchetti. Il valore iniziale predefinito è "
+"sempre l'architettura nativa del sistema (<literal>APT::Architecture</"
+"literal>), e le altre architetture vengono aggiunte all'elenco predefinito "
+"quando sono registrate con <command>dpkg --add-architecture</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:180
@@ -3546,10 +3484,10 @@ msgid ""
"but note that APT provides no direct means to reinstall them."
msgstr ""
"Attiva in modo predefinito. Quando attiva, la funzionalità autoclean rimuove "
-"dalla cache ogni pacchetto che non può più essere scaricato. Se "
-"disattivata, allora sono esclusi dalla rimozione anche i pacchetti che sono "
-"installati; fare attenzione però al fatto che APT non fornisce alcun mezzo "
-"diretto per reinstallarli."
+"dalla cache ogni pacchetto che non può più essere scaricato. Se disattivata, "
+"allora sono esclusi dalla rimozione anche i pacchetti che sono installati; "
+"fare attenzione però al fatto che APT non fornisce alcun mezzo diretto per "
+"reinstallarli."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:199
@@ -3638,15 +3576,14 @@ msgid ""
"<command>dpkg</command>, <command>dash</command> or anything that those "
"packages depend on."
msgstr ""
-"Non attivare mai questa opzione a meno di non sapere "
-"<emphasis>veramente</emphasis> ciò che si sta facendo. Permette ad APT di "
-"rimuovere temporaneamente un pacchetto essenziale per rompere un ciclo "
-"Conflicts/Conflicts o Conflicts/Pre-Depends tra due pacchetti essenziali. "
-"<emphasis>Un tale ciclo non dovrebbe mai esistere ed è un bug "
-"grave</emphasis>. Questa opzione funziona se i pacchetti essenziali non sono "
-"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
-"<command>dpkg</command>, <command>dash</command> o qualsiasi altro da cui "
-"dipendono tali pacchetti."
+"Non attivare mai questa opzione a meno di non sapere <emphasis>veramente</"
+"emphasis> ciò che si sta facendo. Permette ad APT di rimuovere "
+"temporaneamente un pacchetto essenziale per rompere un ciclo Conflicts/"
+"Conflicts o Conflicts/Pre-Depends tra due pacchetti essenziali. <emphasis>Un "
+"tale ciclo non dovrebbe mai esistere ed è un bug grave</emphasis>. Questa "
+"opzione funziona se i pacchetti essenziali non sono <command>tar</command>, "
+"<command>gzip</command>, <command>libc</command>, <command>dpkg</command>, "
+"<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:247
@@ -3668,11 +3605,11 @@ msgid ""
"automatic growth of the cache is disabled."
msgstr ""
"APT, a partire dalla versione 0.7.26, usa un file cache ridimensionabile "
-"mappato in memoria per memorizzare le informazioni disponibili. <literal"
-">Cache-Start</literal> funziona da indicatore della dimensione che la cache "
-"raggiungerà ed è perciò la quantità di memoria che APT richiederà all'avvio. "
-"Il valore predefinito è 20971520 byte (~20 MB). Notare che questa quantità "
-"di spazio deve essere disponibile per APT, altrimenti probabilmente "
+"mappato in memoria per memorizzare le informazioni disponibili. "
+"<literal>Cache-Start</literal> funziona da indicatore della dimensione che "
+"la cache raggiungerà ed è perciò la quantità di memoria che APT richiederà "
+"all'avvio. Il valore predefinito è 20971520 byte (~20 MB). Notare che questa "
+"quantità di spazio deve essere disponibile per APT, altrimenti probabilmente "
"terminerà con un fallimento in modo molto poco grazioso; perciò per i "
"dispositivi con memoria limitata questo valore dovrebbe essere abbassato, "
"mentre nei sistemi con molte fonti configurate dovrebbe essere aumentato. "
@@ -3681,10 +3618,10 @@ msgstr ""
"Start</literal> non è sufficiente; il valore predefinito è 1048576 (~1 MB). "
"Questo valore verrà applicato più volte, fino a che la cache non è grande "
"abbastanza per memorizzare tutte le informazioni o la dimensione della cache "
-"raggiunge il valore <literal>Cache-Limit</literal>. Il valore predefinito "
-"di <literal>Cache-Limit</literal> è 0 che indica nessun limite. Se <literal"
-">Cache-Grow</literal> viene impostato a 0 la crescita automatica della cache "
-"è disabilitata."
+"raggiunge il valore <literal>Cache-Limit</literal>. Il valore predefinito di "
+"<literal>Cache-Limit</literal> è 0 che indica nessun limite. Se "
+"<literal>Cache-Grow</literal> viene impostato a 0 la crescita automatica "
+"della cache è disabilitata."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:263
@@ -3796,8 +3733,7 @@ msgstr ""
"un archivio aggiornato più spesso che ha un'intestazione <literal>Valid-"
"Until</literal>, invece di disabilitare completamente il controllo della "
"data di scadenza. Possono essere fatte impostazioni specifiche per ciascun "
-"archivio aggiungendo l'etichetta dell'archivio in fondo al nome "
-"dell'opzione."
+"archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:328
@@ -3837,12 +3773,11 @@ msgid ""
"target host will be opened, <literal>access</literal> means that one "
"connection per URI type will be opened."
msgstr ""
-"Modalità di coda; <literal>Queue-Mode</literal> può essere "
-"<literal>host</literal> o <literal>access</literal>, che determinano come "
-"APT mette in parallelo le connessioni in uscita. <literal>host</literal> "
-"significa che viene aperta una connessione per ogni host bersaglio, "
-"<literal>access</literal> significa che viene aperta una connessione per "
-"ogni tipo di URI."
+"Modalità di coda; <literal>Queue-Mode</literal> può essere <literal>host</"
+"literal> o <literal>access</literal>, che determinano come APT mette in "
+"parallelo le connessioni in uscita. <literal>host</literal> significa che "
+"viene aperta una connessione per ogni host bersaglio, <literal>access</"
+"literal> significa che viene aperta una connessione per ogni tipo di URI."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:349
@@ -3877,13 +3812,12 @@ msgid ""
"be used."
msgstr ""
"<literal>http::Proxy</literal> imposta il proxy predefinito da usare per gli "
-"URI HTTP. È nella forma standard "
-"<literal>http://[[utente][:password]@]host[:porta]/</literal>. Possono anche "
-"essere specificati proxy per ciascun host usando la forma "
-"<literal>http::Proxy::&lt;host&gt;</literal> con la speciale parola chiave "
-"<literal>DIRECT</literal> che significa di non usare un proxy. Se non viene "
-"specificata alcuna delle impostazioni precedenti, viene usata la variabile "
-"d'ambiente <envar>http_proxy</envar>."
+"URI HTTP. È nella forma standard <literal>http://[[utente][:password]@]host[:"
+"porta]/</literal>. Possono anche essere specificati proxy per ciascun host "
+"usando la forma <literal>http::Proxy::&lt;host&gt;</literal> con la speciale "
+"parola chiave <literal>DIRECT</literal> che significa di non usare un proxy. "
+"Se non viene specificata alcuna delle impostazioni precedenti, viene usata "
+"la variabile d'ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:367
@@ -3898,12 +3832,12 @@ msgid ""
msgstr ""
"Sono fornite tre impostazioni per il controllo della cache in proxy con "
"cache conformi a HTTP/1.1. <literal>No-Cache</literal> indica al proxy di "
-"non usare la sua risposta in cache in nessuna circostanza. <literal>Max-"
-"Age</literal> imposta l'età massima consentita (in secondi) di un file "
-"indice nella cache del proxy. <literal>No-Store</literal> specifica che il "
-"proxy non deve memorizzare i file archivio richiesti nella sua cache, il che "
-"può essere usato per evitare che il proxy riempia la propria cache con "
-"(grandi) file .deb."
+"non usare la sua risposta in cache in nessuna circostanza. <literal>Max-Age</"
+"literal> imposta l'età massima consentita (in secondi) di un file indice "
+"nella cache del proxy. <literal>No-Store</literal> specifica che il proxy "
+"non deve memorizzare i file archivio richiesti nella sua cache, il che può "
+"essere usato per evitare che il proxy riempia la propria cache con (grandi) "
+"file .deb."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:377 apt.conf.5.xml:449
@@ -3953,11 +3887,11 @@ msgid ""
"that this option implicitly disables downloading from multiple servers at "
"the same time.)"
msgstr ""
-"La quantità di banda utilizzata può essere limitata con "
-"<literal>Acquire::http::Dl-Limit</literal> che accetta valori interi in "
-"kilobyte. Il valore predefinito è 0 che disattiva il limite e cerca di usare "
-"tutta la banda disponibile (notare che questa opzione implicitamente "
-"disabilita lo scaricamento da più server contemporaneamente)."
+"La quantità di banda utilizzata può essere limitata con <literal>Acquire::"
+"http::Dl-Limit</literal> che accetta valori interi in kilobyte. Il valore "
+"predefinito è 0 che disattiva il limite e cerca di usare tutta la banda "
+"disponibile (notare che questa opzione implicitamente disabilita lo "
+"scaricamento da più server contemporaneamente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:395
@@ -4010,26 +3944,24 @@ msgid ""
"literal> is the corresponding per-host option."
msgstr ""
"La sotto-opzione <literal>CaInfo</literal> specifica la posizione del file "
-"che contiene le informazioni sui certificati fidati; "
-"<literal>&lt;host&gt;::CaInfo</literal> è la corrispondente opzione "
-"specifica per ciascun host. La sotto-opzione booleana <literal>Verify-"
-"Peer</literal> determina se il certificato host del server deve o non deve "
-"essere verificato usando i certificati fidati; <literal>&lt;host&gt"
-";::Verify-Peer</literal> è la corrispondente opzione specifica per ciascun "
-"host. La sotto-opzione booleana <literal>Verify-Host</literal> determina se "
-"il nome host del server deve o non deve essere verificato; "
-"<literal>&lt;host&gt;::Verify-Host</literal> è la corrispondente opzione "
-"specifica per ciascun host. <literal>SslCert</literal> determina quale "
-"certificato usare per l'autenticazione client; "
+"che contiene le informazioni sui certificati fidati; <literal>&lt;host&gt;::"
+"CaInfo</literal> è la corrispondente opzione specifica per ciascun host. La "
+"sotto-opzione booleana <literal>Verify-Peer</literal> determina se il "
+"certificato host del server deve o non deve essere verificato usando i "
+"certificati fidati; <literal>&lt;host&gt;::Verify-Peer</literal> è la "
+"corrispondente opzione specifica per ciascun host. La sotto-opzione booleana "
+"<literal>Verify-Host</literal> determina se il nome host del server deve o "
+"non deve essere verificato; <literal>&lt;host&gt;::Verify-Host</literal> è "
+"la corrispondente opzione specifica per ciascun host. <literal>SslCert</"
+"literal> determina quale certificato usare per l'autenticazione client; "
"<literal>&lt;host&gt;::SslCert</literal> è la corrispondente opzione "
"specifica per ciascun host. <literal>SslKey</literal> determina quale chiave "
-"privata usare per l'autenticazione client; "
-"<literal>&lt;host&gt;::SslKey</literal> è la corrispondente opzione "
-"specifica per ciascun host. <literal>SslForceVersion</literal> scavalca la "
-"versione predefinita SSL da usare e può contenere la stringa "
-"«<literal>TLSv1</literal>» o «<literal>SSLv3</literal>»; "
-"<literal>&lt;host&gt;::SslForceVersion</literal> è la corrispondente opzione "
-"specifica per ciascun host."
+"privata usare per l'autenticazione client; <literal>&lt;host&gt;::SslKey</"
+"literal> è la corrispondente opzione specifica per ciascun host. "
+"<literal>SslForceVersion</literal> scavalca la versione predefinita SSL da "
+"usare e può contenere la stringa «<literal>TLSv1</literal>» o "
+"«<literal>SSLv3</literal>»; <literal>&lt;host&gt;::SslForceVersion</"
+"literal> è la corrispondente opzione specifica per ciascun host."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:432
@@ -4050,21 +3982,20 @@ msgid ""
"literal> and <literal>$(SITE_PORT)</literal>."
msgstr ""
"<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per gli "
-"URI FTP. È nella forma standard "
-"<literal>ftp://[[utente][:password]@]host[:porta]/</literal>. Si possono "
-"anche specificare proxy per ciascun host usando la forma "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> con la speciale parola chiave "
-"<literal>DIRECT</literal> che indica di non usare proxy. Se nessuna delle "
-"opzioni precedenti è impostata, viene usata la variabile d'ambiente "
-"<envar>ftp_proxy</envar>. Per usare un proxy FTP è necessario impostare lo "
-"script <literal>ftp::ProxyLogin</literal> nel file di configurazione. Questa "
-"voce specifica i comandi da inviare per dire al server proxy a cosa "
-"connettersi. Vedere &configureindex; per un esempio di come utilizzarla. Le "
-"variabili di sostituzione che rappresentano i corrispondenti componenti "
-"dell'URI sono <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> e "
-"<literal>$(SITE_PORT)</literal>."
+"URI FTP. È nella forma standard <literal>ftp://[[utente][:password]@]host[:"
+"porta]/</literal>. Si possono anche specificare proxy per ciascun host "
+"usando la forma <literal>ftp::Proxy::&lt;host&gt;</literal> con la speciale "
+"parola chiave <literal>DIRECT</literal> che indica di non usare proxy. Se "
+"nessuna delle opzioni precedenti è impostata, viene usata la variabile "
+"d'ambiente <envar>ftp_proxy</envar>. Per usare un proxy FTP è necessario "
+"impostare lo script <literal>ftp::ProxyLogin</literal> nel file di "
+"configurazione. Questa voce specifica i comandi da inviare per dire al "
+"server proxy a cosa connettersi. Vedere &configureindex; per un esempio di "
+"come utilizzarla. Le variabili di sostituzione che rappresentano i "
+"corrispondenti componenti dell'URI sono <literal>$(PROXY_USER)</literal>, "
+"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, <literal>"
+"$(SITE_PASS)</literal>, <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:452
@@ -4078,9 +4009,9 @@ msgstr ""
"Sono fornite diverse impostazioni per controllare la modalità passiva. "
"Generalmente è sicuro lasciare attiva la modalità passiva; funziona in quasi "
"tutti gli ambienti. Tuttavia in alcune situazioni è necessario disabilitare "
-"la modalità passiva e usare invece la modalità per porta FTP. Ciò può "
-"essere fatto globalmente o, per connessioni che passano attraverso un proxy, "
-"per uno specifico host (vedere il file di configurazione d'esempio)."
+"la modalità passiva e usare invece la modalità per porta FTP. Ciò può essere "
+"fatto globalmente o, per connessioni che passano attraverso un proxy, per "
+"uno specifico host (vedere il file di configurazione d'esempio)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:459
@@ -4146,16 +4077,14 @@ msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
msgstr ""
-"Per gli URI GPGV l'unica opzione configurabile è "
-"<literal>gpgv::Options</literal>, che passa parametri aggiuntivi a gpgv."
+"Per gli URI GPGV l'unica opzione configurabile è <literal>gpgv::Options</"
+"literal>, che passa parametri aggiuntivi a gpgv."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml:497
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr ""
-"Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> "
-"\"<replaceable>NomeMetodo</replaceable>\";"
+msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:492
@@ -4206,18 +4135,17 @@ msgid ""
"automatically."
msgstr ""
"Inoltre si può usare il sottogruppo <literal>Order</literal> per definire in "
-"quale ordine il sistema di acquisizione cerca di scaricare i file "
-"compressi. Il sistema tenta con il primo tipo di compressione e in caso di "
-"errore passa al successivo nell'elenco perciò, per preferire un tipo "
-"rispetto ad un altro, basta mettere il tipo preferito per primo; i tipi "
-"predefiniti che non sono già presenti vengono aggiunti in modo implicito "
-"alla fine dell'elenco, perciò si può usare, ad esempio, <placeholder "
-"type=\"synopsis\" id=\"0\"/> per preferire i file compressi con "
-"<command>gzip</command> a <command>bzip2</command> e "
-"<command>lzma</command>. Se si volesse preferire <command>lzma</command> "
-"rispetto a <command>gzip</command> e <command>bzip2</command>, "
-"l'impostazione di configurazione sarebbe: <placeholder type=\"synopsis\" "
-"id=\"1\"/> Non è necessario aggiungere esplicitamente <literal>bz2</literal> "
+"quale ordine il sistema di acquisizione cerca di scaricare i file compressi. "
+"Il sistema tenta con il primo tipo di compressione e in caso di errore passa "
+"al successivo nell'elenco perciò, per preferire un tipo rispetto ad un "
+"altro, basta mettere il tipo preferito per primo; i tipi predefiniti che non "
+"sono già presenti vengono aggiunti in modo implicito alla fine dell'elenco, "
+"perciò si può usare, ad esempio, <placeholder type=\"synopsis\" id=\"0\"/> "
+"per preferire i file compressi con <command>gzip</command> a <command>bzip2</"
+"command> e <command>lzma</command>. Se si volesse preferire <command>lzma</"
+"command> rispetto a <command>gzip</command> e <command>bzip2</command>, "
+"l'impostazione di configurazione sarebbe: <placeholder type=\"synopsis\" id="
+"\"1\"/> Non è necessario aggiungere esplicitamente <literal>bz2</literal> "
"all'elenco, dato che verrà aggiunto automaticamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
@@ -4240,18 +4168,17 @@ msgid ""
"list style. This will not override the defined list; it will only prefix "
"the list with this type."
msgstr ""
-"Notare che "
-"<literal>Dir::Bin::<replaceable>NomeMetodo</replaceable></literal> viene "
-"controllata al momento dell'esecuzione. Se questa opzione è stata impostata, "
-"il metodo verrà usato solo se questo file è esistente; ad esempio, per il "
-"metodo <literal>bzip2</literal> l'impostazione (interna) è: <placeholder "
-"type=\"literallayout\" id=\"0\"/> Notare anche che le voci nell'elenco "
-"specificate nella riga di comando vengono aggiunte alla fine dell'elenco "
-"specificato nei file di configurazione, ma prima delle voci predefinite. In "
-"questo caso, per preferire un tipo rispetto a quelli specificati nei file di "
-"configurazione si può impostare l'opzione direttamente, non nello stile per "
-"elenco. Ciò non sovrascrive l'elenco definito; aggiunge solamente il tipo "
-"indicato all'inizio dell'elenco."
+"Notare che <literal>Dir::Bin::<replaceable>NomeMetodo</replaceable></"
+"literal> viene controllata al momento dell'esecuzione. Se questa opzione è "
+"stata impostata, il metodo verrà usato solo se questo file è esistente; ad "
+"esempio, per il metodo <literal>bzip2</literal> l'impostazione (interna) è: "
+"<placeholder type=\"literallayout\" id=\"0\"/> Notare anche che le voci "
+"nell'elenco specificate nella riga di comando vengono aggiunte alla fine "
+"dell'elenco specificato nei file di configurazione, ma prima delle voci "
+"predefinite. In questo caso, per preferire un tipo rispetto a quelli "
+"specificati nei file di configurazione si può impostare l'opzione "
+"direttamente, non nello stile per elenco. Ciò non sovrascrive l'elenco "
+"definito; aggiunge solamente il tipo indicato all'inizio dell'elenco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:517
@@ -4275,8 +4202,8 @@ msgid ""
msgstr ""
"Quando si scaricano indici compressi con <literal>gzip</literal> (Packages, "
"Sources o Translations), li mantiene localmente compressi con gzip invece di "
-"spacchettarli. Questo fa risparmiare parecchio spazio su disco a spese di "
-"un maggiore uso della CPU quando si creano le cache locali dei pacchetti. In "
+"spacchettarli. Questo fa risparmiare parecchio spazio su disco a spese di un "
+"maggiore uso della CPU quando si creano le cache locali dei pacchetti. In "
"modo predefinito è disabilitato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4290,13 +4217,13 @@ msgid ""
"<filename>Translation</filename> files for every language - the long "
"language codes are especially rare."
msgstr ""
-"La sottosezione Languages controlla quali file "
-"<filename>Translation</filename> sono scaricati e in quale ordine APT cerca "
-"di visualizzare le traduzioni delle descrizioni. APT cerca di visualizzare "
-"la prima descrizione disponibile nella lingua elencata per prima. Le lingue "
-"possono essere definite con i loro codici brevi o lunghi. Notare che non "
-"tutti gli archivi forniscono i file <filename>Translation</filename> per "
-"tutte le lingue; i codici di lingua lunghi sono particolarmente rari."
+"La sottosezione Languages controlla quali file <filename>Translation</"
+"filename> sono scaricati e in quale ordine APT cerca di visualizzare le "
+"traduzioni delle descrizioni. APT cerca di visualizzare la prima descrizione "
+"disponibile nella lingua elencata per prima. Le lingue possono essere "
+"definite con i loro codici brevi o lunghi. Notare che non tutti gli archivi "
+"forniscono i file <filename>Translation</filename> per tutte le lingue; i "
+"codici di lingua lunghi sono particolarmente rari."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
#: apt.conf.5.xml:549
@@ -4325,23 +4252,23 @@ msgid ""
"locale (where the order would be \"fr, de, en\"). <placeholder type="
"\"programlisting\" id=\"0\"/>"
msgstr ""
-"L'elenco predefinito include «environment» ed «en». "
-"«<literal>environment</literal>» ha un significato speciale in questo "
-"contesto: viene sostituito al momento dell'esecuzione dai codici di lingua "
-"estratti dalla variabile d'ambiente <literal>LC_MESSAGES</literal>. Assicura "
-"anche che questi codici non vengano inclusi due volte nell'elenco. Se "
-"<literal>LC_MESSAGES</literal> è impostata a «C», viene usato solamente il "
-"file <filename>Translation-en</filename> (se disponibile). Per forzare APT a "
-"non usare alcun file Translation, usare l'impostazione "
-"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" è un "
-"altro codice con significato speciale che interrompe la ricerca di un file "
-"<filename>Translation</filename> adatto. Questo dice ad APT di scaricare "
-"anche queste traduzioni, senza usarle realmente a meno che l'ambiente non "
-"specifichi le lingue. Perciò il seguente esempio di configurazione avrà come "
-"risultato l'ordine «en, it» in una localizzazione inglese o «it, en» in una "
-"italiana. Notare che «fr» viene scaricato, ma non usato, a meno che APT non "
-"venga usato in una localizzazione francese (dove l'ordine sarebbe «fr, it, "
-"en»). <placeholder type=\"programlisting\" id=\"0\"/>"
+"L'elenco predefinito include «environment» ed «en». «<literal>environment</"
+"literal>» ha un significato speciale in questo contesto: viene sostituito al "
+"momento dell'esecuzione dai codici di lingua estratti dalla variabile "
+"d'ambiente <literal>LC_MESSAGES</literal>. Assicura anche che questi codici "
+"non vengano inclusi due volte nell'elenco. Se <literal>LC_MESSAGES</literal> "
+"è impostata a «C», viene usato solamente il file <filename>Translation-en</"
+"filename> (se disponibile). Per forzare APT a non usare alcun file "
+"Translation, usare l'impostazione <literal>Acquire::Languages=none</"
+"literal>. \"<literal>none</literal>\" è un altro codice con significato "
+"speciale che interrompe la ricerca di un file <filename>Translation</"
+"filename> adatto. Questo dice ad APT di scaricare anche queste traduzioni, "
+"senza usarle realmente a meno che l'ambiente non specifichi le lingue. "
+"Perciò il seguente esempio di configurazione avrà come risultato l'ordine "
+"«en, it» in una localizzazione inglese o «it, en» in una italiana. Notare "
+"che «fr» viene scaricato, ma non usato, a meno che APT non venga usato in "
+"una localizzazione francese (dove l'ordine sarebbe «fr, it, en»). "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:550
@@ -4357,13 +4284,23 @@ msgstr ""
"vengono aggiunti alla fine dell'elenco (dopo un \"<literal>none</literal>\" "
"implicito)."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4377,13 +4314,13 @@ msgstr ""
"relative a informazioni di stato locali. <literal>lists</literal> è la "
"directory in cui mettere gli elenchi scaricati dei pacchetti e "
"<literal>status</literal> è il nome del file di stato di &dpkg;. "
-"<literal>preferences</literal> è il nome del file "
-"<filename>preferences</filename> di APT. <literal>Dir::State</literal> "
-"contiene la directory predefinita da anteporre a tutte le sottovoci che non "
-"iniziano con <filename>/</filename> o <filename>./</filename>."
+"<literal>preferences</literal> è il nome del file <filename>preferences</"
+"filename> di APT. <literal>Dir::State</literal> contiene la directory "
+"predefinita da anteporre a tutte le sottovoci che non iniziano con "
+"<filename>/</filename> o <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4397,16 +4334,15 @@ msgstr ""
"<literal>Dir::Cache</literal> contiene le posizioni relative alle "
"informazioni della cache locale, come le due cache dei pacchetti "
"<literal>srcpkgcache</literal> e <literal>pkgcache</literal>, così come la "
-"posizione in cui mettere gli archivi scaricati: "
-"<literal>Dir::Cache::archives</literal>. La generazione delle cache può "
-"essere disattivata impostando il loro nome ad una stringa vuota. Questo "
-"rallenta l'avvio ma fa risparmiare spazio su disco. È probabilmente "
-"preferibile disattivare pkgcache piuttosto che srcpkgcache. Come per "
-"<literal>Dir::State</literal>, la directory predefinita è contenuta in "
-"<literal>Dir::Cache</literal>"
+"posizione in cui mettere gli archivi scaricati: <literal>Dir::Cache::"
+"archives</literal>. La generazione delle cache può essere disattivata "
+"impostando il loro nome ad una stringa vuota. Questo rallenta l'avvio ma fa "
+"risparmiare spazio su disco. È probabilmente preferibile disattivare "
+"pkgcache piuttosto che srcpkgcache. Come per <literal>Dir::State</literal>, "
+"la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4421,7 +4357,7 @@ msgstr ""
"configurazione specificato da <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4432,7 +4368,7 @@ msgstr ""
"termine viene caricato il file di configurazione principale."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4441,16 +4377,15 @@ msgid ""
"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
"literal> specify the location of the respective programs."
msgstr ""
-"<literal>Dir::Bin</literal> punta ai programmi binari; "
-"<literal>Dir::Bin::Methods</literal> specifica la posizione dei gestori dei "
-"metodi e <literal>gzip</literal>, <literal>bzip2</literal>, "
-"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> "
-"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> e "
-"<literal>apt-cache</literal> specificano la posizione dei rispettivi "
-"programmi."
+"<literal>Dir::Bin</literal> punta ai programmi binari; <literal>Dir::Bin::"
+"Methods</literal> specifica la posizione dei gestori dei metodi e "
+"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
+"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
+"literal> <literal>dpkg-buildpackage</literal> e <literal>apt-cache</literal> "
+"specificano la posizione dei rispettivi programmi."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4466,12 +4401,12 @@ msgstr ""
"relativi a <literal>RootDir</literal>, <emphasis>anche i percorsi che sono "
"specificati in modo assoluto</emphasis>. Perciò, ad esempio, se "
"<literal>RootDir</literal> è impostata a <filename>/tmp/staging</filename> e "
-"<literal>Dir::State::status</literal> è impostata a "
-"<filename>/var/lib/dpkg/status</filename>, allora il file di stato verrà "
-"cercato in <filename>/tmp/staging/var/lib/dpkg/status</filename>."
+"<literal>Dir::State::status</literal> è impostata a <filename>/var/lib/dpkg/"
+"status</filename>, allora il file di stato verrà cercato in <filename>/tmp/"
+"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4483,19 +4418,18 @@ msgstr ""
"La lista <literal>Ignore-Files-Silently</literal> può essere usata per "
"specificare quali file debbano essere ignorati in modo silenzioso da APT "
"mentre analizza i file nelle directory con i frammenti. In modo predefinito "
-"un file il cui nome termina con <literal>.disabled</literal>, "
-"<literal>~</literal>, <literal>.bak</literal> o "
-"<literal>.dpkg-[a-z]+</literal> viene ignorato in modo silenzioso. Come si "
-"vede nell'ultimo valore predefinito questi modelli possono usare una "
-"sintassi con espressioni regolari."
+"un file il cui nome termina con <literal>.disabled</literal>, <literal>~</"
+"literal>, <literal>.bak</literal> o <literal>.dpkg-[a-z]+</literal> viene "
+"ignorato in modo silenzioso. Come si vede nell'ultimo valore predefinito "
+"questi modelli possono usare una sintassi con espressioni regolari."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4506,7 +4440,7 @@ msgstr ""
"sezione <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4517,10 +4451,9 @@ msgid ""
"downloadable (replaced with a new version for instance). <literal>pre-auto</"
"literal> performs this action before downloading new packages."
msgstr ""
-"Modalità di pulizia della cache; i valori permessi sono "
-"<literal>always</literal>, <literal>prompt</literal>, "
-"<literal>auto</literal>, <literal>pre-auto</literal> e "
-"<literal>never</literal>. <literal>always</literal> e "
+"Modalità di pulizia della cache; i valori permessi sono <literal>always</"
+"literal>, <literal>prompt</literal>, <literal>auto</literal>, <literal>pre-"
+"auto</literal> e <literal>never</literal>. <literal>always</literal> e "
"<literal>prompt</literal> rimuovono tutti i pacchetti dalla cache dopo ogni "
"aggiornamento; <literal>prompt</literal> (il valore predefinito) lo fa in "
"modo condizionato. <literal>auto</literal> rimuove solo quei pacchetti che "
@@ -4529,7 +4462,7 @@ msgstr ""
"scaricare i nuovi pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4539,7 +4472,7 @@ msgstr ""
"installazione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4549,7 +4482,7 @@ msgstr ""
"aggiornamento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4559,12 +4492,12 @@ msgstr ""
"solo in caso di errore."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr "Come APT invoca &dpkg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4573,7 +4506,7 @@ msgstr ""
"&dpkg;; sono nella sezione <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4584,7 +4517,7 @@ msgstr ""
"passata a &dpkg; come un singolo argomento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4593,12 +4526,11 @@ msgid ""
msgstr ""
"Questa è una lista di comandi di shell da eseguire prima/dopo l'invocazione "
"di &dpkg;. Come <literal>options</literal> deve essere specificata con la "
-"notazione per le liste. I comandi sono invocati in ordine usando "
-"<filename>/bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà "
-"annullando."
+"notazione per le liste. I comandi sono invocati in ordine usando <filename>/"
+"bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4607,14 +4539,14 @@ msgid ""
"going to install to the commands, one per line on standard input."
msgstr ""
"Questa è una lista di comandi di shell da eseguire prima di invocare &dpkg;. "
-"Come <literal>options</literal> deve essere specificata con la notazione "
-"per le liste. I comandi sono invocati in ordine usando "
-"<filename>/bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà "
-"annullando. APT passa i nomi di file di tutti i file .deb che sta per "
-"installare ai comandi, uno per riga, sullo standard input."
+"Come <literal>options</literal> deve essere specificata con la notazione per "
+"le liste. I comandi sono invocati in ordine usando <filename>/bin/sh</"
+"filename>; se qualcuno dei comandi fallisce APT terminerà annullando. APT "
+"passa i nomi di file di tutti i file .deb che sta per installare ai comandi, "
+"uno per riga, sullo standard input."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4626,11 +4558,11 @@ msgstr ""
"la versione del protocollo, lo spazio di configurazione di APT, e i "
"pacchetti, file e versioni che vengono modificati. La versione 2 viene "
"abilitata impostando <literal>DPkg::Tools::options::cmd::Version</literal> a "
-"2. <literal>cmd</literal> è un comando passato a <literal>Pre-Install-"
-"Pkgs</literal>."
+"2. <literal>cmd</literal> è un comando passato a <literal>Pre-Install-Pkgs</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4639,7 +4571,7 @@ msgstr ""
"valore predefinito è <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4649,12 +4581,12 @@ msgstr ""
"binari."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr "Uso dei trigger di dpkg (e relative opzioni)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4682,7 +4614,7 @@ msgstr ""
"pacchetti."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4696,7 +4628,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4716,11 +4648,11 @@ msgstr ""
"miglioramento che si presenta e assicurarsi di indicare nella segnalazione "
"quali opzioni sono state usate. Potrebbe anche essere utile chiedere aiuto a "
"&dpkg; per il debug; vedere ad esempio <command>dpkg --audit</command>. Una "
-"combinazione di opzioni sulla difensiva sarebbe <placeholder "
-"type=\"literallayout\" id=\"0\"/>"
+"combinazione di opzioni sulla difensiva sarebbe <placeholder type="
+"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4732,18 +4664,17 @@ msgid ""
"calls."
msgstr ""
"Aggiunge l'opzione --no-triggers a tutte le invocazioni di &dpkg; (tranne la "
-"chiamata ConfigurePending). Se si è interessati a capire cosa ciò "
-"significhi veramente, vedere &dpkg;. In breve: quando questa opzione è "
-"presente &dpkg; non esegue i trigger, a meno che non sia esplicitamente "
-"chiamato per farlo con una chiamata aggiuntiva. Notare che questa opzione "
-"esiste (non documentata) anche in versioni più vecchie di APT, con un "
-"significato leggermente diverso: prima queste opzioni aggiungevano solamente "
-"--no-triggers alle chiamate di &dpkg; per la configurazione, ora APT "
-"aggiunge questa opzione anche alle chiamate per lo spacchettamento e la "
-"rimozione."
+"chiamata ConfigurePending). Se si è interessati a capire cosa ciò significhi "
+"veramente, vedere &dpkg;. In breve: quando questa opzione è presente &dpkg; "
+"non esegue i trigger, a meno che non sia esplicitamente chiamato per farlo "
+"con una chiamata aggiuntiva. Notare che questa opzione esiste (non "
+"documentata) anche in versioni più vecchie di APT, con un significato "
+"leggermente diverso: prima queste opzioni aggiungevano solamente --no-"
+"triggers alle chiamate di &dpkg; per la configurazione, ora APT aggiunge "
+"questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4760,21 +4691,20 @@ msgid ""
msgstr ""
"Valori permessi sono «<literal>all</literal>», «<literal>smart</literal>» e "
"«<literal>no</literal>». Il valore predefinito è «<literal>all</literal>», "
-"il che fa sì che APT configuri tutti i pacchetti. Il modo "
-"«<literal>smart</literal>» (intelligente) è quello di configurare solo i "
-"pacchetti che devono essere configurati prima che possa essere spacchettato "
-"un altro pacchetto (Pre-Depends), e lasciare che il resto venga configurato "
-"da &dpkg; con una chiamata generata dall'opzione ConfigurePending (vedere "
-"più sotto). D'altro canto, «<literal>no</literal>» non configura nulla e si "
-"affida completamente a &dpkg; per la configurazione (che al momento fallisce "
-"se viene incontrata una relazione Pre-Depends). Impostare questo parametro "
-"ad un qualsiasi valore diverso da <literal>all</literal> attiva "
-"implicitamente in modo predefinito anche l'opzione successiva, dato che "
-"altrimenti il sistema potrebbe finire in uno stato non configurato e "
-"potenzialmente non avviabile."
+"il che fa sì che APT configuri tutti i pacchetti. Il modo «<literal>smart</"
+"literal>» (intelligente) è quello di configurare solo i pacchetti che devono "
+"essere configurati prima che possa essere spacchettato un altro pacchetto "
+"(Pre-Depends), e lasciare che il resto venga configurato da &dpkg; con una "
+"chiamata generata dall'opzione ConfigurePending (vedere più sotto). D'altro "
+"canto, «<literal>no</literal>» non configura nulla e si affida completamente "
+"a &dpkg; per la configurazione (che al momento fallisce se viene incontrata "
+"una relazione Pre-Depends). Impostare questo parametro ad un qualsiasi "
+"valore diverso da <literal>all</literal> attiva implicitamente in modo "
+"predefinito anche l'opzione successiva, dato che altrimenti il sistema "
+"potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4783,17 +4713,16 @@ msgid ""
"want to run APT multiple times in a row - e.g. in an installer. In these "
"sceneries you could deactivate this option in all but the last run."
msgstr ""
-"Se questa opzione è impostata, APT invoca <command>dpkg --configure "
-"--pending</command> per lasciare che &dpkg; gestisca tutte le configurazioni "
-"e i trigger necessari. Questa opzione viene attivata automaticamente in "
-"modo predefinito se l'opzione precedente non è impostata a "
-"<literal>all</literal>, ma potrebbe essere utile disattivarla se si desidera "
-"eseguire APT più volte di seguito, ad esempio in un installatore. In uno "
-"scenario simile si può disattivare questa opzione in tutte le esecuzioni "
-"tranne l'ultima."
+"Se questa opzione è impostata, APT invoca <command>dpkg --configure --"
+"pending</command> per lasciare che &dpkg; gestisca tutte le configurazioni e "
+"i trigger necessari. Questa opzione viene attivata automaticamente in modo "
+"predefinito se l'opzione precedente non è impostata a <literal>all</"
+"literal>, ma potrebbe essere utile disattivarla se si desidera eseguire APT "
+"più volte di seguito, ad esempio in un installatore. In uno scenario simile "
+"si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4802,15 +4731,14 @@ msgid ""
"process all triggers, not only the triggers needed to configure this package."
msgstr ""
"Utile per la configurazione <literal>smart</literal> dato che un pacchetto "
-"che ha trigger in sospeso non è considerato come "
-"<literal>installato</literal> e &dpkg; attualmente lo tratta come "
-"<literal>spacchettato</literal> che è un ostacolo per le relazioni Pre-"
-"Depends (vedere il bug Debian #526774). Notare che questo elaborerà tutti i "
-"trigger, non solo quelli necessari per configurare il pacchetto in "
-"questione."
+"che ha trigger in sospeso non è considerato come <literal>installato</"
+"literal> e &dpkg; attualmente lo tratta come <literal>spacchettato</literal> "
+"che è un ostacolo per le relazioni Pre-Depends (vedere il bug Debian "
+"#526774). Notare che questo elaborerà tutti i trigger, non solo quelli "
+"necessari per configurare il pacchetto in questione."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4828,7 +4756,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4843,42 +4771,41 @@ msgstr ""
"I pacchetti essenziali (e le loro dipendenze) dovrebbero essere configurati "
"immediatamente dopo essere stati spacchettati. È una buona idea farlo "
"abbastanza presto nel processo di aggiornamento, dato che queste chiamate di "
-"configurazione al momento richiedono anche "
-"<literal>DPkg::TriggersPending</literal> che esegue un certo numero di "
-"trigger (che potrebbero non essere necessari). I pacchetti essenziali "
-"ottengono in modo predefinito un punteggio alto, ma il contrassegno di "
-"immediatezza è relativamente basso (un pacchetto che ha una relazione Pre-"
-"Depends è valutato con un punteggio maggiore). Queste opzioni e le altre "
-"nello stesso gruppo possono essere usate per cambiare il punteggio. "
-"L'esempio seguente mostra le impostazioni con i loro valori predefiniti. "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"configurazione al momento richiedono anche <literal>DPkg::TriggersPending</"
+"literal> che esegue un certo numero di trigger (che potrebbero non essere "
+"necessari). I pacchetti essenziali ottengono in modo predefinito un "
+"punteggio alto, ma il contrassegno di immediatezza è relativamente basso (un "
+"pacchetto che ha una relazione Pre-Depends è valutato con un punteggio "
+"maggiore). Queste opzioni e le altre nello stesso gruppo possono essere "
+"usate per cambiare il punteggio. L'esempio seguente mostra le impostazioni "
+"con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr "Opzioni Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
"for the brief documentation of these options."
msgstr ""
-"I gruppi di opzioni <literal>APT::Periodic</literal> e "
-"<literal>APT::Archives</literal> configurano il comportamento degli "
-"aggiornamenti periodici di apt, ciò viene fatto attraverso lo script "
-"<literal>/etc/cron.daily/apt</literal>. Per una breve documentazione di "
-"queste opzioni, vedere all'inizio dello script."
+"I gruppi di opzioni <literal>APT::Periodic</literal> e <literal>APT::"
+"Archives</literal> configurano il comportamento degli aggiornamenti "
+"periodici di apt, ciò viene fatto attraverso lo script <literal>/etc/cron."
+"daily/apt</literal>. Per una breve documentazione di queste opzioni, vedere "
+"all'inizio dello script."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr "Opzioni di debug"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4896,18 +4823,18 @@ msgstr ""
"esserlo:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
"literal>."
msgstr ""
"<literal>Debug::pkgProblemResolver</literal> abilita l'output relativo alle "
-"decisioni prese da <literal>dist-upgrade, upgrade, install, remove, "
-"purge</literal>."
+"decisioni prese da <literal>dist-upgrade, upgrade, install, remove, purge</"
+"literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4918,7 +4845,7 @@ msgstr ""
"install</literal>) come utente non root."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4930,7 +4857,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4939,38 +4866,37 @@ msgstr ""
"negli ID dei CD-ROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr "Segue un elenco completo delle opzioni di debug per apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
-"Stampa informazioni relative all'accesso a fonti "
-"<literal>cdrom://</literal>."
+"Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4979,7 +4905,7 @@ msgstr ""
"usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4988,14 +4914,14 @@ msgstr ""
"pacchetti memorizzati su CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
-"Descrive il processo di risoluzione delle dipendenze di compilazione in "
-"&apt-get;."
+"Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
+"get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -5004,7 +4930,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5015,7 +4941,7 @@ msgstr ""
"system del CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5025,14 +4951,14 @@ msgstr ""
"contemporaneamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale "
"degli scaricamenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5041,7 +4967,7 @@ msgstr ""
"codici di controllo e delle firme di cifratura dei file scaricati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5051,7 +4977,7 @@ msgstr ""
"diff."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5061,7 +4987,7 @@ msgstr ""
"invece degli indici completi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5069,7 +4995,7 @@ msgstr ""
"realmente gli scaricamenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5078,7 +5004,7 @@ msgstr ""
"installato dei pacchetti e alla rimozione dei pacchetti non utilizzati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5090,11 +5016,11 @@ msgstr ""
"automaticamente installati per risolvere delle dipendenze. Corrisponde al "
"passo iniziale di installazione automatica effettuato, ad esempio, in "
"<literal>apt-get install</literal> e non all'intero risolutore di dipendenze "
-"di <literal>apt</literal>; per quello vedere "
-"<literal>Debug::pkgProblemResolver</literal>."
+"di <literal>apt</literal>; per quello vedere <literal>Debug::"
+"pkgProblemResolver</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5114,20 +5040,19 @@ msgstr ""
"contrassegnati per essere mantenuti/installati/rimossi mentre il "
"ProblemResolver fa il suo lavoro. Ogni aggiunta o rimozione può causare "
"azioni aggiuntive che vengono mostrate con un rientro di due spazi in più "
-"sotto alla voce originale. Il formato per ogni riga è "
-"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> o "
-"<literal>MarkInstall</literal> seguito da <literal>nome-pacchetto &lt;a.b.c "
-"-&gt; d.e.f | x.y.z&gt; (sezione)</literal> dove <literal>a.b.c</literal> è "
-"l'attuale versione del pacchetto, <literal>d.e.f</literal> è la versione "
-"presa in considerazione per l'installazione e <literal>x.y.z</literal> è una "
-"versione più recente, ma non considerata per l'installazione (a causa di un "
-"punteggio di pin più basso). Gli ultimi due possono essere omessi se non "
-"esistono o se sono uguali alla versione installata. "
-"<literal>sezione</literal> è il nome della sezione in cui compare il "
-"pacchetto."
+"sotto alla voce originale. Il formato per ogni riga è <literal>MarkKeep</"
+"literal>, <literal>MarkDelete</literal> o <literal>MarkInstall</literal> "
+"seguito da <literal>nome-pacchetto &lt;a.b.c -&gt; d.e.f | x.y.z&gt; "
+"(sezione)</literal> dove <literal>a.b.c</literal> è l'attuale versione del "
+"pacchetto, <literal>d.e.f</literal> è la versione presa in considerazione "
+"per l'installazione e <literal>x.y.z</literal> è una versione più recente, "
+"ma non considerata per l'installazione (a causa di un punteggio di pin più "
+"basso). Gli ultimi due possono essere omessi se non esistono o se sono "
+"uguali alla versione installata. <literal>sezione</literal> è il nome della "
+"sezione in cui compare il pacchetto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5136,7 +5061,7 @@ msgstr ""
"gli argomenti separati da un singolo carattere di spazio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5145,16 +5070,16 @@ msgstr ""
"di stato ed ogni errore incontrato durante la sua analisi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
-"Genera un trace dell'algoritmo che decide l'ordine in cui "
-"<literal>apt</literal> deve passare i pacchetti a &dpkg;."
+"Genera un trace dell'algoritmo che decide l'ordine in cui <literal>apt</"
+"literal> deve passare i pacchetti a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5162,12 +5087,12 @@ msgstr ""
"nell'invocazione di &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5177,7 +5102,7 @@ msgstr ""
"dipendenze)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5188,22 +5113,22 @@ msgstr ""
"la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
-"Stampa informazioni sui fornitori lette da "
-"<filename>/etc/apt/vendors.list</filename>."
+"Stampa informazioni sui fornitori lette da <filename>/etc/apt/vendors.list</"
+"filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Esempi"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5213,7 +5138,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5231,9 +5156,9 @@ msgid ""
"installation."
msgstr ""
"Il file delle preferenze di APT, <filename>/etc/apt/preferences</filename> e "
-"i file frammento nella directory "
-"<filename>/etc/apt/preferences.d/</filename> possono essere usati per "
-"controllare quale versione verrà selezionata per l'installazione."
+"i file frammento nella directory <filename>/etc/apt/preferences.d/</"
+"filename> possono essere usati per controllare quale versione verrà "
+"selezionata per l'installazione."
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:42
@@ -5310,16 +5235,15 @@ msgid ""
"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
"case it will be silently ignored."
msgstr ""
-"Notare che i file nella directory "
-"<filename>/etc/apt/preferences.d</filename> vengono analizzati in ordine "
-"alfanumerico crescente e i loro nomi devono conformarsi alle seguenti "
-"convenzioni: non devono avere estensione o avere estensione "
-"\"<literal>pref</literal>\", e possono contenere solo caratteri alfanumerici, "
-"trattini (-), trattini bassi (_) e punti (.). In caso contrario APT stampa "
-"un messaggio che informa che un file è stato ignorato, a meno che tale file "
-"non corrisponda ad un modello nell'elenco di configurazione <literal>Dir"
-"::Ignore-Files-Silently</literal>, nel qual caso viene ignorato in modo "
-"silenzioso."
+"Notare che i file nella directory <filename>/etc/apt/preferences.d</"
+"filename> vengono analizzati in ordine alfanumerico crescente e i loro nomi "
+"devono conformarsi alle seguenti convenzioni: non devono avere estensione o "
+"avere estensione \"<literal>pref</literal>\", e possono contenere solo "
+"caratteri alfanumerici, trattini (-), trattini bassi (_) e punti (.). In "
+"caso contrario APT stampa un messaggio che informa che un file è stato "
+"ignorato, a meno che tale file non corrisponda ad un modello nell'elenco di "
+"configurazione <literal>Dir::Ignore-Files-Silently</literal>, nel qual caso "
+"viene ignorato in modo silenzioso."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:79
@@ -5330,8 +5254,7 @@ msgstr "Assegnazioni della priorità predefinite di APT"
#: apt_preferences.5.xml:94
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
-msgstr "<command>apt-get install -t testing <replaceable>un-"
-"pacchetto</replaceable></command>\n"
+msgstr "<command>apt-get install -t testing <replaceable>un-pacchetto</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:97
@@ -5359,14 +5282,13 @@ msgstr ""
"è la priorità della distribuzione a cui essa appartiene. È possibile "
"distinguere una distribuzione, il «rilascio obiettivo», che riceve in modo "
"predefinito una priorità maggiore delle altre distribuzioni. Il rilascio "
-"obiettivo può essere impostato nella riga di comando di <command>apt-"
-"get</command> o nel file di configurazione di APT, "
-"<filename>/etc/apt/apt.conf</filename>. Notare che questa impostazione ha "
-"precedenza rispetto a qualsiasi priorità generale sia stata impostata nel "
-"file <filename>/etc/apt/preferences</filename> descritto in seguito, ma non "
-"rispetto a pacchetti per cui è specificatamente indicato un pin. Per "
-"esempio, <placeholder type=\"programlisting\" id=\"0\"/> <placeholder "
-"type=\"programlisting\" id=\"1\"/>"
+"obiettivo può essere impostato nella riga di comando di <command>apt-get</"
+"command> o nel file di configurazione di APT, <filename>/etc/apt/apt.conf</"
+"filename>. Notare che questa impostazione ha precedenza rispetto a qualsiasi "
+"priorità generale sia stata impostata nel file <filename>/etc/apt/"
+"preferences</filename> descritto in seguito, ma non rispetto a pacchetti per "
+"cui è specificatamente indicato un pin. Per esempio, <placeholder type="
+"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:101
@@ -5411,8 +5333,8 @@ msgstr ""
"alla versione che è già installata (se esiste) e alla versioni che "
"provengono da archivi che, nei loro file <filename>Release</filename>, sono "
"contrassegnati come «NotAutomatic: yes» e «ButAutomaticUpgrades: yes», come "
-"l'archivio Debian backports a partire da <literal>squeeze-"
-"backports</literal>."
+"l'archivio Debian backports a partire da <literal>squeeze-backports</"
+"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:121
@@ -5453,10 +5375,10 @@ msgstr ""
"Se il rilascio obiettivo non è stato specificato, allora APT assegna "
"semplicemente la priorità 100 a tutte le versioni di pacchetto installate e "
"la priorità 500 a tutte le versioni di pacchetto non installate, tranne le "
-"versioni che provengono da archivi che, nei loro file "
-"<filename>Release</filename>, sono contrassegnati come «NotAutomatic: yes»; "
-"queste ultime versioni hanno priorità 1, oppure priorità 100 se sono in "
-"aggiunta contrassegnate come «ButAutomaticUpgrades: yes»."
+"versioni che provengono da archivi che, nei loro file <filename>Release</"
+"filename>, sono contrassegnati come «NotAutomatic: yes»; queste ultime "
+"versioni hanno priorità 1, oppure priorità 100 se sono in aggiunta "
+"contrassegnate come «ButAutomaticUpgrades: yes»."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:139
@@ -5522,8 +5444,9 @@ msgstr ""
"In una situazione tipica, la versione installata di un pacchetto (priorità "
"100) non è così recente come una delle versioni disponibili dalle fonti "
"elencate nel file &sources-list; (priorità 500 o 990). Quindi il pacchetto "
-"viene aggiornato quando viene eseguito <command>apt-get install <replaceable"
-">un-pacchetto</replaceable></command> o <command>apt-get upgrade</command>."
+"viene aggiornato quando viene eseguito <command>apt-get install "
+"<replaceable>un-pacchetto</replaceable></command> o <command>apt-get "
+"upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:165
@@ -5533,10 +5456,10 @@ msgid ""
"downgraded when <command>apt-get install <replaceable>some-package</"
"replaceable></command> or <command>apt-get upgrade</command> is executed."
msgstr ""
-"Più raramente, la versione installata di un pacchetto è "
-"<emphasis>più</emphasis> recente di qualsiasi altra versione disponibile. Il "
-"pacchetto non viene retrocesso quando viene eseguito <command>apt-get "
-"install <replaceable>un-pacchetto</replaceable></command> o <command>apt-get "
+"Più raramente, la versione installata di un pacchetto è <emphasis>più</"
+"emphasis> recente di qualsiasi altra versione disponibile. Il pacchetto non "
+"viene retrocesso quando viene eseguito <command>apt-get install "
+"<replaceable>un-pacchetto</replaceable></command> o <command>apt-get "
"upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -5589,9 +5512,9 @@ msgstr ""
"La forma specifica assegna una priorità (una «Pin-Priority») ad uno o più "
"pacchetti specifici con una versione o un intervallo di versioni specifici. "
"Ad esempio, il record seguente assegna una priorità alta a tutte le versioni "
-"del pacchetto <filename>perl</filename> il cui numero di versione inizia "
-"con «<literal>&good-perl;</literal>». Più pacchetti possono essere separati "
-"da spazi."
+"del pacchetto <filename>perl</filename> il cui numero di versione inizia con "
+"«<literal>&good-perl;</literal>». Più pacchetti possono essere separati da "
+"spazi."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:194
@@ -5651,10 +5574,10 @@ msgid ""
"high priority to all versions available from the server identified by the "
"hostname \"ftp.de.debian.org\""
msgstr ""
-"Un avvertimento: la parola chiave usata in questo caso è "
-"«<literal>origin</literal>» e può essere usata per indicare un nome host. Il "
-"record seguente assegna una priorità alta a tutte le versioni disponibili "
-"dal server identificato dal nome host «ftp.de.debian.org»"
+"Un avvertimento: la parola chiave usata in questo caso è «<literal>origin</"
+"literal>» e può essere usata per indicare un nome host. Il record seguente "
+"assegna una priorità alta a tutte le versioni disponibili dal server "
+"identificato dal nome host «ftp.de.debian.org»"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:220
@@ -5769,11 +5692,11 @@ msgid ""
"extended regular expression surrounded by slashes)."
msgstr ""
"APT permette anche di impostare priorità di pin usando espressioni &glob; ed "
-"espressioni regolari racchiuse tra sbarre («/»). L'esempio seguente "
-"assegna, ad esempio, la priorità 500 a tutti i pacchetti da experimental il "
-"cui nome inizia con gnome (indicato con un'espressione in stile &glob;) "
-"oppure contiene la parola kde (indicato in forma di espressione regolare "
-"estesa POSIX racchiusa tra sbarre)."
+"espressioni regolari racchiuse tra sbarre («/»). L'esempio seguente assegna, "
+"ad esempio, la priorità 500 a tutti i pacchetti da experimental il cui nome "
+"inizia con gnome (indicato con un'espressione in stile &glob;) oppure "
+"contiene la parola kde (indicato in forma di espressione regolare estesa "
+"POSIX racchiusa tra sbarre)."
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
#: apt_preferences.5.xml:273
@@ -5820,12 +5743,12 @@ msgid ""
"specific pins override it. The pattern \"<literal>*</literal>\" in a "
"Package field is not considered a &glob; expression in itself."
msgstr ""
-"Se un'espressione regolare viene usata in un campo "
-"<literal>Package</literal>, il comportamento è equivalente a quello che si "
-"otterrebbe se l'espressione regolare fosse sostituita da un elenco di tutti "
-"i nomi di pacchetto a cui corrisponde. Non è chiaro se questo comportamento "
-"verrà modificato in futuro; perciò si dovrebbero sempre indicare per primi i "
-"pin con caratteri jolly, in modo che i pin specifici successivi abbiano "
+"Se un'espressione regolare viene usata in un campo <literal>Package</"
+"literal>, il comportamento è equivalente a quello che si otterrebbe se "
+"l'espressione regolare fosse sostituita da un elenco di tutti i nomi di "
+"pacchetto a cui corrisponde. Non è chiaro se questo comportamento verrà "
+"modificato in futuro; perciò si dovrebbero sempre indicare per primi i pin "
+"con caratteri jolly, in modo che i pin specifici successivi abbiano "
"precedenza su di essi. Il modello «<literal>*</literal>» in un campo Package "
"non viene considerato come un'espressione &glob;."
@@ -5994,10 +5917,9 @@ msgid ""
msgstr ""
"Verrà installata la più recente versione disponibile del pacchetto "
"<literal>perl</literal>, fintanto che il suo numero di versione inizia con "
-"«<literal>&good-perl;</literal>». Se è disponibile <emphasis>una "
-"qualsiasi</emphasis> versione &good-perl;* di <literal>perl</literal> e la "
-"versione installata è &bad-perl;*, allora <literal>perl</literal> verrà "
-"retrocesso."
+"«<literal>&good-perl;</literal>». Se è disponibile <emphasis>una qualsiasi</"
+"emphasis> versione &good-perl;* di <literal>perl</literal> e la versione "
+"installata è &bad-perl;*, allora <literal>perl</literal> verrà retrocesso."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:379
@@ -6053,12 +5975,12 @@ msgid ""
"relevant for setting APT priorities:"
msgstr ""
"Il file <filename>Packages</filename> si trova normalmente nella directory "
-"<filename>.../dists/<replaceable>nome-dist</replaceable>/<replaceable>compon"
-"ente</replaceable>/<replaceable>arch</replaceable></filename>: per esempio, "
-"<filename>.../dists/stable/main/binary-i386/Packages</filename>. È "
-"costituito da una serie di record su più righe, uno per ogni pacchetto "
-"disponibile in tale directory. In ciascun record solo due righe sono "
-"rilevanti per l'impostazione delle priorità di APT:"
+"<filename>.../dists/<replaceable>nome-dist</replaceable>/"
+"<replaceable>componente</replaceable>/<replaceable>arch</replaceable></"
+"filename>: per esempio, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>. È costituito da una serie di record su più righe, uno "
+"per ogni pacchetto disponibile in tale directory. In ciascun record solo due "
+"righe sono rilevanti per l'impostazione delle priorità di APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:407
@@ -6094,13 +6016,13 @@ msgid ""
msgstr ""
"Il file <filename>Release</filename> si trova normalmente nella directory "
"<filename>.../dists/<replaceable>nome-dist</replaceable></filename>: ad "
-"esempio, <filename>.../dists/stable/Release</filename> o <filename>.../dists"
-"/&stable-codename;/Release</filename>. Consiste di un record su più righe "
-"che si applica a <emphasis>tutti</emphasis> i pacchetti nell'albero di "
-"directory sottostante alla directory genitrice. A differenza di ciò che "
-"avviene per il file <filename>Packages</filename>, quasi tutte le righe in "
-"un file <filename>Release</filename> sono importanti per l'impostazione "
-"delle priorità di APT:"
+"esempio, <filename>.../dists/stable/Release</filename> o <filename>.../dists/"
+"&stable-codename;/Release</filename>. Consiste di un record su più righe che "
+"si applica a <emphasis>tutti</emphasis> i pacchetti nell'albero di directory "
+"sottostante alla directory genitrice. A differenza di ciò che avviene per il "
+"file <filename>Packages</filename>, quasi tutte le righe in un file "
+"<filename>Release</filename> sono importanti per l'impostazione delle "
+"priorità di APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:428
@@ -6146,8 +6068,8 @@ msgid ""
"preferences file would require the line:"
msgstr ""
"indica il nome in codice a cui appartengono tutti i pacchetti nell'albero di "
-"directory. Per esempio, la riga «Codename: &testing-codename;» specifica "
-"che tutti i pacchetti nell'albero di directory sottostante la directory che "
+"directory. Per esempio, la riga «Codename: &testing-codename;» specifica che "
+"tutti i pacchetti nell'albero di directory sottostante la directory che "
"contiene il file <filename>Release</filename> appartengono ad una versione "
"chiamata <literal>&testing-codename;</literal>. Per specificare questo "
"valore nelle preferenze di APT si deve usare la riga:"
@@ -6279,13 +6201,13 @@ msgstr ""
"Tutti i file <filename>Packages</filename> e <filename>Release</filename> "
"recuperati dalle posizioni elencate nel file &sources-list; sono memorizzati "
"nella directory <filename>/var/lib/apt/lists</filename> o nel file indicato "
-"dalla variabile <literal>Dir::State::Lists</literal> nel file "
-"<filename>apt.conf</filename>. Per esempio, il file <filename>debian.lcs.mit"
-".edu_debian_dists_unstable_contrib_binary-i386_Release</filename> contiene "
-"il file <filename>Release</filename> recuperato dal sito "
-"<literal>debian.lcs.mit.edu</literal> per i file dell'architettura "
-"<literal>binary-i386</literal> nella componente <literal>contrib</literal> "
-"della distribuzione <literal>unstable</literal>."
+"dalla variabile <literal>Dir::State::Lists</literal> nel file <filename>apt."
+"conf</filename>. Per esempio, il file <filename>debian.lcs.mit."
+"edu_debian_dists_unstable_contrib_binary-i386_Release</filename> contiene il "
+"file <filename>Release</filename> recuperato dal sito <literal>debian.lcs."
+"mit.edu</literal> per i file dell'architettura <literal>binary-i386</"
+"literal> nella componente <literal>contrib</literal> della distribuzione "
+"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:536
@@ -6300,9 +6222,8 @@ msgid ""
"provides a place for comments."
msgstr ""
"Ogni record nel file delle preferenze di APT può iniziare opzionalmente con "
-"una o più righe che cominciano con la parola "
-"<literal>Explanation:</literal>. Ciò fornisce un posto dove mettere "
-"commenti."
+"una o più righe che cominciano con la parola <literal>Explanation:</"
+"literal>. Ciò fornisce un posto dove mettere commenti."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:547
@@ -6347,8 +6268,8 @@ msgstr ""
"alta di quella predefinita (500) a tutte le versioni di pacchetto che "
"appartengono alla distribuzione <literal>stable</literal>, e una priorità "
"eccezionalmente bassa alle versioni di pacchetto che appartengono alle altre "
-"distribuzioni <literal>Debian</literal>. <placeholder type=\"programlisting\" "
-"id=\"0\"/>"
+"distribuzioni <literal>Debian</literal>. <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
@@ -6373,8 +6294,8 @@ msgid ""
msgstr ""
"Con un file &sources-list; adatto e il file di preferenze descritto sopra, "
"uno qualsiasi dei seguenti comandi farà sì che APT aggiorni il sistema alle "
-"versioni più recenti di <literal>stable</literal>. <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"versioni più recenti di <literal>stable</literal>. <placeholder type="
+"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:584
@@ -6439,11 +6360,11 @@ msgid ""
"\"programlisting\" id=\"0\"/>"
msgstr ""
"Il seguente file di preferenze di APT fa sì che APT assegni una priorità "
-"alta alle versioni di pacchetto nella distribuzione "
-"<literal>testing</literal>, una priorità più bassa alle versioni di "
-"pacchetto nella distribuzione <literal>unstable</literal>, e una priorità "
-"eccezionalmente bassa alle versioni di pacchetto nelle altre distribuzioni "
-"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
+"alta alle versioni di pacchetto nella distribuzione <literal>testing</"
+"literal>, una priorità più bassa alle versioni di pacchetto nella "
+"distribuzione <literal>unstable</literal>, e una priorità eccezionalmente "
+"bassa alle versioni di pacchetto nelle altre distribuzioni <literal>Debian</"
+"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:613
@@ -6455,8 +6376,8 @@ msgid ""
msgstr ""
"Con un file &sources-list; adatto e il file di preferenze descritto sopra, "
"uno qualsiasi dei seguenti comandi farà sì che APT aggiorni il sistema alle "
-"versioni più recenti di <literal>testing</literal>. <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"versioni più recenti di <literal>testing</literal>. <placeholder type="
+"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:633
@@ -6609,9 +6530,9 @@ msgid ""
"APT front-end)."
msgstr ""
"L'elenco delle fonti <filename>/etc/apt/sources.list</filename> è progettato "
-"per supportare qualsiasi numero di fonti attive e svariati supporti. Il "
-"file elenca una fonte per riga, con la fonte preferita elencata per prima. "
-"Le informazioni disponibili dalle fonti configurate sono acquisite con "
+"per supportare qualsiasi numero di fonti attive e svariati supporti. Il file "
+"elenca una fonte per riga, con la fonte preferita elencata per prima. Le "
+"informazioni disponibili dalle fonti configurate sono acquisite con "
"<command>apt-get update</command> (o con un comando equivalente in un'altra "
"interfaccia per APT)."
@@ -6624,11 +6545,11 @@ msgid ""
"and a <literal>#</literal> character anywhere on a line marks the remainder "
"of that line as a comment."
msgstr ""
-"Ogni riga che specifica una fonte inizia con il tipo (per esempio <literal"
-">deb-src</literal>), seguito dalle opzioni e dagli argomenti per tale tipo. "
-"Ogni singola voce non può essere divisa su più righe. Le righe vuote vengono "
-"ignorate e un carattere <literal>#</literal> in qualsiasi punto di una riga "
-"contrassegna come commento la parte rimanente della riga."
+"Ogni riga che specifica una fonte inizia con il tipo (per esempio "
+"<literal>deb-src</literal>), seguito dalle opzioni e dagli argomenti per "
+"tale tipo. Ogni singola voce non può essere divisa su più righe. Le righe "
+"vuote vengono ignorate e un carattere <literal>#</literal> in qualsiasi "
+"punto di una riga contrassegna come commento la parte rimanente della riga."
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml:53
@@ -6682,11 +6603,11 @@ msgstr ""
"<literal>stable</literal> o <literal>testing</literal>, oppure un nome in "
"codice come <literal>&stable-codename;</literal> o <literal>&testing-"
"codename;</literal>; componente è uno tra <literal>main</literal>, "
-"<literal>contrib</literal> o <literal>non-free</literal>. Il tipo <literal"
-">deb-src</literal> è un riferimento al codice sorgente di una distribuzione "
-"Debian nella stessa forma di quella del tipo <literal>deb</literal>. Per "
-"recuperare gli indici dei pacchetti sorgente è necessaria una riga <literal"
-">deb-src</literal>."
+"<literal>contrib</literal> o <literal>non-free</literal>. Il tipo "
+"<literal>deb-src</literal> è un riferimento al codice sorgente di una "
+"distribuzione Debian nella stessa forma di quella del tipo <literal>deb</"
+"literal>. Per recuperare gli indici dei pacchetti sorgente è necessaria una "
+"riga <literal>deb-src</literal>."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
@@ -6718,12 +6639,12 @@ msgstr ""
"L'URI per il tipo <literal>deb</literal> deve specificare la base della "
"distribuzione Debian, dalla quale APT troverà le informazioni necessarie. "
"<literal>distribuzione</literal> può specificare un percorso esatto, nel "
-"qual caso le componenti devono essere omesse e "
-"<literal>distribuzione</literal> deve terminare con una sbarra "
-"(<literal>/</literal>). Questo è utile nel caso in cui si è interessati solo "
-"a una particolare sottosezione dell'archivio indicata dall'URI. Se "
-"<literal>distribuzione</literal> non specifica un percorso esatto, deve "
-"essere presente almeno una <literal>componente</literal>."
+"qual caso le componenti devono essere omesse e <literal>distribuzione</"
+"literal> deve terminare con una sbarra (<literal>/</literal>). Questo è "
+"utile nel caso in cui si è interessati solo a una particolare sottosezione "
+"dell'archivio indicata dall'URI. Se <literal>distribuzione</literal> non "
+"specifica un percorso esatto, deve essere presente almeno una "
+"<literal>componente</literal>."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
@@ -6736,8 +6657,8 @@ msgid ""
"<literal>APT</literal> will automatically generate a URI with the current "
"architecture otherwise."
msgstr ""
-"<literal>distribuzione</literal> può anche contenere una variabile "
-"<literal>$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
+"<literal>distribuzione</literal> può anche contenere una variabile <literal>"
+"$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
"<literal>amd64</literal> o <literal>armel</literal>) usata nel sistema. Ciò "
"consente di utilizzare file <filename>sources.list</filename> indipendenti "
"dall'architettura. In generale questo è interessante solo quando viene "
@@ -6782,11 +6703,11 @@ msgid ""
"settings will be ignored silently):"
msgstr ""
"<literal>opzioni</literal> è sempre opzionale e deve essere racchiuso tra "
-"parentesi quadre. Può consistere di più impostazioni nella forma <literal><r"
-"eplaceable>impostazione</replaceable>=<replaceable>valore</replaceable></lit"
-"eral>. Impostazioni multiple vengono separate da spazi. APT supporta le "
-"seguenti impostazioni (notare però che le impostazioni non supportate "
-"verranno ignorate in modo silenzioso):"
+"parentesi quadre. Può consistere di più impostazioni nella forma "
+"<literal><replaceable>impostazione</replaceable>=<replaceable>valore</"
+"replaceable></literal>. Impostazioni multiple vengono separate da spazi. APT "
+"supporta le seguenti impostazioni (notare però che le impostazioni non "
+"supportate verranno ignorate in modo silenzioso):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml:117
@@ -6797,11 +6718,11 @@ msgid ""
"architectures defined by the <literal>APT::Architectures</literal> option "
"will be downloaded."
msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceab"
-"le>,…</literal> può essere usato per specificare le architetture per le "
-"quali scaricare le informazioni. Se questa opzione non è impostata verranno "
-"scaricate tutte le architetture definite dall'opzione "
-"<literal>APT::Architectures</literal>."
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> può essere usato per specificare le architetture "
+"per le quali scaricare le informazioni. Se questa opzione non è impostata "
+"verranno scaricate tutte le architetture definite dall'opzione <literal>APT::"
+"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml:121
@@ -6814,12 +6735,11 @@ msgid ""
"handles even correctly authenticated sources as not authenticated."
msgstr ""
"<literal>trusted=yes</literal> può essere usato per indicare che i pacchetti "
-"da questa fonte sono sempre autenticati anche se il file "
-"<filename>Release</filename> non è firmato o la firma non può essere "
-"controllata. Ciò disabilita parti di &apt-secure; e dovrebbe quindi essere "
-"usato solo in un contesto locale o fidato. <literal>trusted=no</literal> fa "
-"l'opposto e tratta anche le fonti correttamente autenticate come non "
-"autenticate."
+"da questa fonte sono sempre autenticati anche se il file <filename>Release</"
+"filename> non è firmato o la firma non può essere controllata. Ciò "
+"disabilita parti di &apt-secure; e dovrebbe quindi essere usato solo in un "
+"contesto locale o fidato. <literal>trusted=no</literal> fa l'opposto e "
+"tratta anche le fonti correttamente autenticate come non autenticate."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:128
@@ -6848,8 +6768,7 @@ msgid ""
" "
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-"
-"free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
#. type: Content of: <refentry><refsect1><title>
@@ -6894,11 +6813,11 @@ msgid ""
"authentication."
msgstr ""
"Il tipo http specifica un server HTTP per l'archivio. Se è impostata una "
-"variabile d'ambiente <envar>http_proxy</envar> con il formato "
-"http://server:porta/, verrà usato il server proxy specificato in "
-"<envar>http_proxy</envar>. Gli utenti con proxy HTTP/1.1 con autenticazione "
-"possono usare una stringa nel formato http://utente:password@server:porta/. "
-"Notare che questo è un metodo di autenticazione non sicuro."
+"variabile d'ambiente <envar>http_proxy</envar> con il formato http://server:"
+"porta/, verrà usato il server proxy specificato in <envar>http_proxy</"
+"envar>. Gli utenti con proxy HTTP/1.1 con autenticazione possono usare una "
+"stringa nel formato http://utente:password@server:porta/. Notare che questo "
+"è un metodo di autenticazione non sicuro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:172
@@ -6916,9 +6835,9 @@ msgstr ""
"APT è altamente configurabile; per maggiori informazioni vedere la pagina di "
"manuale &apt-conf;. Notare che è possibile specificare un proxy FTP usando "
"la variabile d'ambiente <envar>ftp_proxy</envar>. È possibile specificare un "
-"proxy HTTP (i server proxy HTTP spesso gestiscono gli URL FTP) usando "
-"questa e <emphasis>SOLO</emphasis> questa variabile d'ambiente. I proxy che "
-"usano HTTP specificati nel file di configurazione verranno ignorati."
+"proxy HTTP (i server proxy HTTP spesso gestiscono gli URL FTP) usando questa "
+"e <emphasis>SOLO</emphasis> questa variabile d'ambiente. I proxy che usano "
+"HTTP specificati nel file di configurazione verranno ignorati."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:184
@@ -6944,8 +6863,8 @@ msgstr ""
"Il metodo rsh/ssh invoca RSH/SSH per connettersi ad un host remoto e "
"accedere ai file come un determinato utente. È raccomandato configurare "
"precedentemente le chiavi RSA o rhosts. Per effettuare i trasferimenti di "
-"file dall'host remoto vengono usati i comandi standard "
-"<command>find</command> e <command>dd</command>."
+"file dall'host remoto vengono usati i comandi standard <command>find</"
+"command> e <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:198
@@ -6964,8 +6883,8 @@ msgid ""
"transport-debtorrent;."
msgstr ""
"APT può essere esteso con ulteriori metodi forniti in altri pacchetti "
-"opzionali, i cui nomi devono seguire lo schema <package>apt-"
-"transport-<replaceable>metodo</replaceable></package>. Per esempio, il team di APT "
+"opzionali, i cui nomi devono seguire lo schema <package>apt-transport-"
+"<replaceable>metodo</replaceable></package>. Per esempio, il team di APT "
"mantiene anche il pacchetto <package>apt-transport-https</package> che "
"fornisce i metodi di accesso per URI HTTPS con funzionalità simili a quelle "
"del metodo http. Sono disponibili anche i metodi per usare, ad esempio, "
@@ -6977,8 +6896,8 @@ msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
-"Usa l'archivio memorizzato in locale (o montato via NFS) in "
-"/home/gianni/debian per stable/main, stable/contrib e stable/non-free."
+"Usa l'archivio memorizzato in locale (o montato via NFS) in /home/gianni/"
+"debian per stable/main, stable/contrib e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:214
@@ -7098,13 +7017,12 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Usa HTTP per accedere all'archivio in ftp.tlh.debian.org nella directory "
-"universe e usa solo i file che si trovano in "
-"<filename>unstable/binary-i386</filename> sulle macchine i386, "
-"<filename>unstable/binary-amd64</filename> su quelle amd64 e così via per le "
-"altre architetture supportate. [Notare che questo esempio illustra "
-"solamente come usare la variabile per la sostituzione; gli archivi Debian "
-"ufficiali non sono strutturati in questo modo.] <placeholder "
-"type=\"literallayout\" id=\"0\"/>"
+"universe e usa solo i file che si trovano in <filename>unstable/binary-i386</"
+"filename> sulle macchine i386, <filename>unstable/binary-amd64</filename> su "
+"quelle amd64 e così via per le altre architetture supportate. [Notare che "
+"questo esempio illustra solamente come usare la variabile per la "
+"sostituzione; gli archivi Debian ufficiali non sono strutturati in questo "
+"modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:253
@@ -7350,14 +7268,13 @@ msgstr ""
"Il comando <literal>release</literal> genera un file Release da un albero di "
"directory. In modo predefinito cerca ricorsivamente nella directory data i "
"file <filename>Packages</filename> e <filename>Sources</filename> non "
-"compressi e quelli compressi con <command>gzip</command>, "
-"<command>bzip2</command> o <command>lzma</command>, come anche i file "
-"<filename>Release</filename> e <filename>md5sum.txt</filename> "
-"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Si possono "
-"aggiungere ulteriori modelli per i nomi di file elencandoli in "
-"<literal>APT::FTPArchive::Release::Patterns</literal>. Scrive poi sullo "
-"stdout un file <filename>Release</filename> contenente per ogni file un "
-"digest MD5, SHA1 e SHA256."
+"compressi e quelli compressi con <command>gzip</command>, <command>bzip2</"
+"command> o <command>lzma</command>, come anche i file <filename>Release</"
+"filename> e <filename>md5sum.txt</filename> (<literal>APT::FTPArchive::"
+"Release::Default-Patterns</literal>). Si possono aggiungere ulteriori "
+"modelli per i nomi di file elencandoli in <literal>APT::FTPArchive::Release::"
+"Patterns</literal>. Scrive poi sullo stdout un file <filename>Release</"
+"filename> contenente per ogni file un digest MD5, SHA1 e SHA256."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:104
@@ -7375,10 +7292,10 @@ msgstr ""
"variabili corrispondenti sotto <literal>APT::FTPArchive::Release</literal>, "
"ad esempio <literal>APT::FTPArchive::Release::Origin</literal>. I campi "
"supportati sono: <literal>Origin</literal>, <literal>Label</literal>, "
-"<literal>Suite</literal>, <literal>Version</literal>, "
-"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
-"Until</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal>."
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:117
@@ -7450,8 +7367,8 @@ msgid ""
msgstr ""
"La sezione <literal>Dir</literal> definisce le directory standard necessarie "
"per localizzare i file richiesti durante il processo di generazione. Queste "
-"directory vengono fatte precedere da alcuni percorsi relativi definiti "
-"nelle sezioni successive, per produrre un percorso assoluto completo."
+"directory vengono fatte precedere da alcuni percorsi relativi definiti nelle "
+"sezioni successive, per produrre un percorso assoluto completo."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:153
@@ -7461,8 +7378,7 @@ msgid ""
"nodes."
msgstr ""
"Specifica la radice dell'archivio FTP; in una configurazione Debian standard "
-"questa è la directory che contiene i nodi <filename>ls-LR</filename> e "
-"dist."
+"questa è la directory che contiene i nodi <filename>ls-LR</filename> e dist."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:160
@@ -7603,8 +7519,7 @@ msgid ""
msgstr ""
"Imposta valori predefiniti specifici per le sezioni <literal>Tree</literal>. "
"Tutte queste variabili sono variabili di sostituzione in cui le stringhe "
-"$(DIST), $(SECTION) e $(ARCH) verranno sostituite dai loro rispettivi "
-"valori."
+"$(DIST), $(SECTION) e $(ARCH) verranno sostituite dai loro rispettivi valori."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:251
@@ -7629,12 +7544,12 @@ msgid ""
msgstr ""
"Controlla il numero di giorni durante i quali un file Contents può essere "
"controllato senza modifiche. Al superamento di questo limite, l'orario mtime "
-"del file Contents viene aggiornato. Questo può succedere se il file "
-"Packages viene modificato in un modo che non ha come risultato un nuovo file "
-"Contents [ad esempio una modifica di override]. È consentito un certo "
-"ritardo, nella speranza che vengano installati nuovi pacchetti .deb, il che "
-"richiederebbe comunque la creazione di un nuovo file. Il valore predefinito "
-"è 10, i valori sono espressi in giorni."
+"del file Contents viene aggiornato. Questo può succedere se il file Packages "
+"viene modificato in un modo che non ha come risultato un nuovo file Contents "
+"[ad esempio una modifica di override]. È consentito un certo ritardo, nella "
+"speranza che vengano installati nuovi pacchetti .deb, il che richiederebbe "
+"comunque la creazione di un nuovo file. Il valore predefinito è 10, i valori "
+"sono espressi in giorni."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:269
@@ -7660,8 +7575,8 @@ msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
-"Imposta il file Packages di uscita. Il valore predefinito è "
-"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
+"Imposta il file Packages di uscita. Il valore predefinito è <filename>"
+"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:287
@@ -7669,8 +7584,8 @@ msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Imposta il file Sources di uscita. Il valore predefinito è "
-"<filename>$(DIST)/$(SECTION)/source/Sources</filename>."
+"Imposta il file Sources di uscita. Il valore predefinito è <filename>$(DIST)/"
+"$(SECTION)/source/Sources</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:293
@@ -7703,12 +7618,11 @@ msgid ""
"ftparchive</command> will integrate those package files together "
"automatically."
msgstr ""
-"Imposta il file Contents di uscita. Il valore predefinito è "
-"<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. Se questa "
-"impostazione fa sì che più file Packages corrispondano a un solo file "
-"Contents (come avviene con il valore predefinito), allora <command>apt-"
-"ftparchive</command> unirà automaticamente insieme questi file dei "
-"pacchetti."
+"Imposta il file Contents di uscita. Il valore predefinito è <filename>"
+"$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. Se questa impostazione fa sì "
+"che più file Packages corrispondano a un solo file Contents (come avviene "
+"con il valore predefinito), allora <command>apt-ftparchive</command> unirà "
+"automaticamente insieme questi file dei pacchetti."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:316
@@ -7813,9 +7727,9 @@ msgid ""
"command> performs an operation similar to: <placeholder type=\"programlisting"
"\" id=\"0\"/>"
msgstr ""
-"Quando elabora una sezione <literal>Tree</literal>, <command>apt-"
-"ftparchive</command> esegue un'operazione simile a: <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"Quando elabora una sezione <literal>Tree</literal>, <command>apt-ftparchive</"
+"command> esegue un'operazione simile a: <placeholder type=\"programlisting\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:368
@@ -7972,10 +7886,10 @@ msgid ""
"for the maintainer field. The second form unconditionally substitutes the "
"maintainer field."
msgstr ""
-"La forma generale del campo manutentore è: <placeholder type=\"literallayout\" "
-"id=\"0\"/> o semplicemente <placeholder type=\"literallayout\" id=\"1\"/>. La "
-"prima forma consente di specificare una lista di vecchi indirizzi di posta "
-"elettronica separati da una doppia sbarra. Se qualcuno di essi viene "
+"La forma generale del campo manutentore è: <placeholder type=\"literallayout"
+"\" id=\"0\"/> o semplicemente <placeholder type=\"literallayout\" id=\"1\"/"
+">. La prima forma consente di specificare una lista di vecchi indirizzi di "
+"posta elettronica separati da una doppia sbarra. Se qualcuno di essi viene "
"trovato, allora il campo manutentore viene sostituito con «nuovo». La "
"seconda forma sostituisce invariabilmente il campo manutentore."
@@ -8027,15 +7941,14 @@ msgstr ""
"Genera i codici di controllo specificati. Queste opzioni sono abilitate in "
"modo predefinito; quando vengono disabilitate i file indice non hanno, "
"quando ciò è possibile, i campi dei codici di controllo. Voci di "
-"configurazione: <literal>APT::FTPArchive::<replaceable>Codice-di-"
-"controllo</replaceable></literal> e "
-"<literal>APT::FTPArchive::<replaceable>Indice</replaceable>::<replaceable"
-">Codice-di-controllo</replaceable></literal> dove "
+"configurazione: <literal>APT::FTPArchive::<replaceable>Codice-di-controllo</"
+"replaceable></literal> e <literal>APT::FTPArchive::<replaceable>Indice</"
+"replaceable>::<replaceable>Codice-di-controllo</replaceable></literal> dove "
"<literal><replaceable>Indice</replaceable></literal> può essere "
-"<literal>Packages</literal>, <literal>Sources</literal> o "
-"<literal>Release</literal> e <literal><replaceable>Codice-di-"
-"controllo</replaceable></literal> può essere <literal>MD5</literal>, "
-"<literal>SHA1</literal> o <literal>SHA256</literal>."
+"<literal>Packages</literal>, <literal>Sources</literal> o <literal>Release</"
+"literal> e <literal><replaceable>Codice-di-controllo</replaceable></literal> "
+"può essere <literal>MD5</literal>, <literal>SHA1</literal> o "
+"<literal>SHA256</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:521
@@ -8056,9 +7969,9 @@ msgid ""
msgstr ""
"Silenzioso; produce un output adatto per un file di registro, omettendo gli "
"indicatori di avanzamento. Ulteriori q produrranno un risultato ancor più "
-"silenzioso, fino a un massimo di 2. È anche possibile usare "
-"<option>-q=n</option> per impostare il livello di silenziosità, scavalcando "
-"il file di configurazione. Voce di configurazione: <literal>quiet</literal>."
+"silenzioso, fino a un massimo di 2. È anche possibile usare <option>-q=n</"
+"option> per impostare il livello di silenziosità, scavalcando il file di "
+"configurazione. Voce di configurazione: <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:535
@@ -8068,11 +7981,11 @@ msgid ""
"and can be turned off with <option>--no-delink</option>. Configuration "
"Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
msgstr ""
-"Effettua il de-collegamento. Se viene usata l'impostazione <literal"
-">External-Links</literal> allora questa opzione abilita di fatto il de-"
-"collegamento dei file. È attiva in modo predefinito e può essere "
-"disabilitata con <option>--no-delink</option>. Voce di configurazione: "
-"<literal>APT::FTPArchive::DeLinkAct</literal>."
+"Effettua il de-collegamento. Se viene usata l'impostazione <literal>External-"
+"Links</literal> allora questa opzione abilita di fatto il de-collegamento "
+"dei file. È attiva in modo predefinito e può essere disabilitata con "
+"<option>--no-delink</option>. Voce di configurazione: <literal>APT::"
+"FTPArchive::DeLinkAct</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:543
@@ -8098,8 +8011,8 @@ msgid ""
"literal>."
msgstr ""
"Seleziona il file override sorgente da usare con il comando "
-"<literal>sources</literal>. Voce di configurazione "
-"<literal>APT::FTPArchive::SourceOverride</literal>."
+"<literal>sources</literal>. Voce di configurazione <literal>APT::FTPArchive::"
+"SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:559
@@ -8118,11 +8031,11 @@ msgid ""
"<literal>*_all.deb</literal> instead of all package files in the given "
"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
msgstr ""
-"Accetta per i comandi <literal>packages</literal> e "
-"<literal>contents</literal> solo i file di pacchetto che corrispondono a "
-"<literal>*_arch.deb</literal> o <literal>*_all.deb</literal> invece di tutti "
-"i file di pacchetto nel percorso specificato. Voce di configurazione: "
-"<literal>APT::FTPArchive::Architecture</literal>."
+"Accetta per i comandi <literal>packages</literal> e <literal>contents</"
+"literal> solo i file di pacchetto che corrispondono a <literal>*_arch.deb</"
+"literal> o <literal>*_all.deb</literal> invece di tutti i file di pacchetto "
+"nel percorso specificato. Voce di configurazione: <literal>APT::FTPArchive::"
+"Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:572
@@ -8159,17 +8072,15 @@ msgstr ""
"Questa opzione di configurazione è impostata a «<literal>true</literal>» in "
"modo predefinito e dovrebbe essere impostata a <literal>«false»</literal> "
"solamente se l'archivio generato con &apt-ftparchive; fornisce anche file "
-"<filename>Translation</filename>. Notare che il file principale <filename"
-">Translation-en</filename> può essere creato solamente con il comando "
-"generate."
+"<filename>Translation</filename>. Notare che il file principale "
+"<filename>Translation-en</filename> può essere creato solamente con il "
+"comando generate."
#. type: Content of: <refentry><refsect1><para><programlisting>
#: apt-ftparchive.1.xml:602
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr "<command>apt-ftparchive</command> packages "
-"<replaceable>directory</replaceable> | <command>gzip</command> > "
-"<filename>Packages.gz</filename>\n"
+msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:598
@@ -8295,8 +8206,8 @@ msgid ""
"B<reportbug>(1) command."
msgstr ""
"Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, "
-"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
-"B<reportbug>(1)."
+"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>"
+"(1)."
#. type: SH
#: apt.8:51
@@ -8373,9 +8284,9 @@ msgid ""
"packages from the Internet."
msgstr ""
"Il pacchetto APT al momento contiene due sezioni, il metodo APT per "
-"<prgn>dselect</prgn> e l'interfaccia utente a riga di comando <prgn>apt-"
-"get</prgn>; entrambi forniscono un modo per installare e rimuovere "
-"pacchetti, così come per scaricarne di nuovi da Internet."
+"<prgn>dselect</prgn> e l'interfaccia utente a riga di comando <prgn>apt-get</"
+"prgn>; entrambi forniscono un modo per installare e rimuovere pacchetti, "
+"così come per scaricarne di nuovi da Internet."
#. type: <heading></heading>
#: guide.sgml:39
@@ -8507,9 +8418,9 @@ msgid ""
"install .deb archives from a <em>Source</em>."
msgstr ""
"<prgn>apt-get</prgn> fornisce un modo semplice di installare i pacchetti "
-"dalla riga di comando. Diversamente da <prgn>dpkg</prgn>, <prgn>apt-"
-"get</prgn> non tratta i file .deb, ma utilizza il vero nome dei pacchetti e "
-"può installare archivi .deb solo da una <em>fonte</em>."
+"dalla riga di comando. Diversamente da <prgn>dpkg</prgn>, <prgn>apt-get</"
+"prgn> non tratta i file .deb, ma utilizza il vero nome dei pacchetti e può "
+"installare archivi .deb solo da una <em>fonte</em>."
#. type: <p></p>
#: guide.sgml:109
@@ -8522,11 +8433,11 @@ msgid ""
"instance,"
msgstr ""
"La prima <footnote><p>Se si sta usando un server proxy http, si deve prima "
-"ancora impostare la variabile d'ambiente http_proxy; vedere "
-"sources.list(5).</p></footnote> cosa da fare prima di usare <prgn>apt-"
-"get</prgn> è scaricare gli elenchi dei pacchetti dalle <em>fonti</em> in "
-"modo che il programma sappia quali pacchetti sono disponibili. Lo si fa con "
-"<tt>apt-get update</tt>. Ad esempio,"
+"ancora impostare la variabile d'ambiente http_proxy; vedere sources.list(5)."
+"</p></footnote> cosa da fare prima di usare <prgn>apt-get</prgn> è scaricare "
+"gli elenchi dei pacchetti dalle <em>fonti</em> in modo che il programma "
+"sappia quali pacchetti sono disponibili. Lo si fa con <tt>apt-get update</"
+"tt>. Ad esempio,"
#. type: <example></example>
#: guide.sgml:116
@@ -8539,8 +8450,7 @@ msgid ""
"Building Dependency Tree... Done"
msgstr ""
"# apt-get update\n"
-"Scaricamento di: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
-"Packages\n"
+"Scaricamento di: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
"Scaricamento di: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
"Lettura elenco dei pacchetti... Fatto\n"
"Generazione albero delle dipendenze... Fatto"
@@ -8647,13 +8557,13 @@ msgid ""
"caused them to be downloaded again without <tt>-d</tt>."
msgstr ""
"<prgn>apt-get</prgn> ha diverse opzioni per la riga di comando, che sono "
-"documentate dettagliatamente nella sua pagina di manuale, <manref "
-"section=\"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non "
-"installa i file scaricati; se il sistema deve scaricare un gran numero di "
-"pacchetti, non è bene iniziare ad installarli nel caso qualcosa dovesse "
-"andare storto. Quando si usa <tt>-d</tt>, gli archivi scaricati possono "
-"essere installati semplicemente eseguendo di nuovo lo stesso comando senza "
-"l'opzione <tt>-d</tt>."
+"documentate dettagliatamente nella sua pagina di manuale, <manref section="
+"\"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non installa "
+"i file scaricati; se il sistema deve scaricare un gran numero di pacchetti, "
+"non è bene iniziare ad installarli nel caso qualcosa dovesse andare storto. "
+"Quando si usa <tt>-d</tt>, gli archivi scaricati possono essere installati "
+"semplicemente eseguendo di nuovo lo stesso comando senza l'opzione <tt>-d</"
+"tt>."
#. type: <heading></heading>
#: guide.sgml:168
@@ -8686,11 +8596,11 @@ msgid ""
"have access to the latest bug fixes. APT will automatically use packages on "
"your CD-ROM before downloading from the Internet."
msgstr ""
-"Per abilitare il metodo APT si deve selezionare [A]ccess in "
-"<prgn>dselect</prgn> e scegliere il metodo APT; verrà chiesto un insieme di "
-"fonti (<em>Sources</em>), cioè di posti da cui scaricare gli archivi. "
-"Possono essere siti Internet remoti, mirror locali di Debian o CD-ROM; ogni "
-"fonte può fornire una parte dell'intero archivio Debian, ed APT le combinerà "
+"Per abilitare il metodo APT si deve selezionare [A]ccess in <prgn>dselect</"
+"prgn> e scegliere il metodo APT; verrà chiesto un insieme di fonti "
+"(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Possono "
+"essere siti Internet remoti, mirror locali di Debian o CD-ROM; ogni fonte "
+"può fornire una parte dell'intero archivio Debian, ed APT le combinerà "
"automaticamente insieme per formare un insieme completo di pacchetti. Se si "
"ha un CD-ROM allora è una buona idea indicarlo per primo e poi specificare "
"un mirror, in modo da avere accesso alle ultime versioni con le soluzioni "
@@ -8765,11 +8675,11 @@ msgid ""
"into the US is legal however."
msgstr ""
"La distribuzione indica la versione Debian dell'archivio: <em>stable</em> è "
-"l'ultima versione rilasciata e <em>unstable</em> è quella di sviluppo. <em"
-">non-US</em> è disponibile solo su alcuni mirror e contiene dei pacchetti in "
-"cui viene usata della tecnologia di cifratura o altre cose che non possono "
-"essere esportate dagli Stati Uniti; importare questi pacchetti negli USA è "
-"però legale."
+"l'ultima versione rilasciata e <em>unstable</em> è quella di sviluppo. "
+"<em>non-US</em> è disponibile solo su alcuni mirror e contiene dei pacchetti "
+"in cui viene usata della tecnologia di cifratura o altre cose che non "
+"possono essere esportate dagli Stati Uniti; importare questi pacchetti negli "
+"USA è però legale."
#. type: <example></example>
#: guide.sgml:228
@@ -8846,8 +8756,8 @@ msgid ""
msgstr ""
"In modo predefinito APT rimuoverà automaticamente i file (.deb) dei "
"pacchetti che sono stati installati con successo. Per modificare questo "
-"comportamento, inserire <tt>Dselect::clean \"prompt\";</tt> in "
-"/etc/apt/apt.conf."
+"comportamento, inserire <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt."
+"conf."
#. type: <heading></heading>
#: guide.sgml:264
@@ -8869,12 +8779,12 @@ msgstr ""
"Sia il metodo APT per <prgn>dselect</prgn> sia <prgn>apt-get</prgn> "
"condividono la stessa interfaccia; si tratta di un sistema semplice che "
"indica in genere cosa sta per fare, e poi lo fa. <footnote><p>Il metodo "
-"<prgn>dselect</prgn> è in realtà un insieme di script di wrapper per <prgn"
-">apt-get</prgn>. Il metodo di fatto fornisce delle funzionalità maggiori del "
-"solo <prgn>apt-get</prgn>.</p></footnote> Dopo la stampa di un riassunto "
-"delle operazioni che saranno fatte, APT stampa dei messaggi informativi "
-"sullo stato, in modo da poter avere un'idea del punto a cui arrivato e di "
-"quanto ci sia ancora da fare."
+"<prgn>dselect</prgn> è in realtà un insieme di script di wrapper per "
+"<prgn>apt-get</prgn>. Il metodo di fatto fornisce delle funzionalità "
+"maggiori del solo <prgn>apt-get</prgn>.</p></footnote> Dopo la stampa di un "
+"riassunto delle operazioni che saranno fatte, APT stampa dei messaggi "
+"informativi sullo stato, in modo da poter avere un'idea del punto a cui "
+"arrivato e di quanto ci sia ancora da fare."
#. type: <heading></heading>
#: guide.sgml:280
@@ -8997,8 +8907,8 @@ msgid ""
"installed."
msgstr ""
"Ci sono due modi in cui un sistema può arrivare in uno stato problematico di "
-"questo genere: il primo avviene se <prgn>dpkg</prgn> non ha ravvisato "
-"alcune relazioni delicate tra i pacchetti durante un aggiornamento. "
+"questo genere: il primo avviene se <prgn>dpkg</prgn> non ha ravvisato alcune "
+"relazioni delicate tra i pacchetti durante un aggiornamento. "
"<footnote><p>APT invece considera tutte le dipendenze note e cerca di "
"evitare la presenza di pacchetti difettosi.</p></footnote> Il secondo è "
"possibile se l'installazione di un pacchetto fallisce; in questo caso è "
@@ -9017,10 +8927,10 @@ msgid ""
msgstr ""
"La seconda situazione è molto meno seria della prima, dato che APT pone "
"alcune restrizioni sull'ordine di installazione dei pacchetti. In entrambi i "
-"casi l'opzione <tt>-f</tt> di <prgn>apt-get</prgn> farà sì che APT trovi "
-"una soluzione possibile e possa continuare. Il metodo APT di "
-"<prgn>dselect</prgn> comprende sempre l'opzione <tt>-f</tt> per permettere "
-"di continuare facilmente anche in caso di script dei manutentori errati."
+"casi l'opzione <tt>-f</tt> di <prgn>apt-get</prgn> farà sì che APT trovi una "
+"soluzione possibile e possa continuare. Il metodo APT di <prgn>dselect</"
+"prgn> comprende sempre l'opzione <tt>-f</tt> per permettere di continuare "
+"facilmente anche in caso di script dei manutentori errati."
#. type: <p></p>
#: guide.sgml:351
@@ -9054,10 +8964,9 @@ msgid ""
msgstr ""
"Prima di procedere, <prgn>apt-get</prgn> presenterà un resoconto delle "
"operazioni che sta per fare. In genere tale resoconto varierà con il tipo di "
-"operazione da fare, ma ci sono svariati elementi comuni: in tutti i casi "
-"gli elenchi riflettono lo stato finale delle cose, e tengono conto "
-"dell'opzione <tt>-f</tt> e di altre attività rilevanti per il comando da "
-"eseguire."
+"operazione da fare, ma ci sono svariati elementi comuni: in tutti i casi gli "
+"elenchi riflettono lo stato finale delle cose, e tengono conto dell'opzione "
+"<tt>-f</tt> e di altre attività rilevanti per il comando da eseguire."
#. type: <heading></heading>
#: guide.sgml:364
@@ -9195,8 +9104,8 @@ msgstr ""
"presenti nel sistema o entrare in conflitto con altri già presenti. In "
"questo caso, il pacchetto viene elencato nella lista di quelli mantenuti "
"alla versione attuale. Il miglior modo per forzare l'installazione dei "
-"pacchetti elencati in questa lista è installarli con <tt>apt-get "
-"install</tt> o usare <prgn>dselect</prgn> per risolvere i problemi."
+"pacchetti elencati in questa lista è installarli con <tt>apt-get install</"
+"tt> o usare <prgn>dselect</prgn> per risolvere i problemi."
#. type: <heading></heading>
#: guide.sgml:431
@@ -9234,7 +9143,8 @@ msgstr "Resoconto finale"
#: guide.sgml:447
msgid ""
"Finally, APT will print out a summary of all the changes that will occur."
-msgstr "Infine, APT stamperà un riassunto di tutte le modifiche che accadranno."
+msgstr ""
+"Infine, APT stamperà un riassunto di tutte le modifiche che accadranno."
#. type: <example></example>
#: guide.sgml:452
@@ -9246,8 +9156,7 @@ msgid ""
msgstr ""
"206 aggiornati, 8 installati, 23 da rimuovere e 51 non aggiornati.\n"
"12 non completamente installati o rimossi..\n"
-"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, "
-"verranno occupati 26.5M di spazio su disco."
+"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco."
#. type: <p></p>
#: guide.sgml:470
@@ -9316,12 +9225,10 @@ msgid ""
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
msgstr ""
"# apt-get update\n"
-"Scaricamento di:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
-"Packages\n"
+"Scaricamento di:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
"Scaricamento di:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
"Trovato http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Scaricamento di:4 http://ftp.de.debian.org/debian-non-US/ "
-"unstable/binary-i386/ Packages\n"
+"Scaricamento di:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
"Scaricamento di:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
@@ -9431,8 +9338,8 @@ msgstr ""
"<prgn>dpkg</prgn> porrà anche alcune domande durante l'elaborazione dei "
"pacchetti, ed i pacchetti stessi potranno farne altre. Prima di ciascuna "
"domanda viene proposta di solito una descrizione di ciò che viene chiesto, e "
-"le domande sono troppo diverse per poter essere discusse in maniera "
-"completa in questa occasione."
+"le domande sono troppo diverse per poter essere discusse in maniera completa "
+"in questa occasione."
#. type: <title></title>
#: offline.sgml:4
@@ -9580,10 +9487,10 @@ msgstr ""
"Il file di configurazione deve indicare ad APT di memorizzare i suoi file "
"sul disco e di usare i file di configurazione anch'essi sul disco. Il file "
"sources.list deve contenere i siti appropriati che si desiderano usare dalla "
-"macchina remota e il file di stato dovrebbe essere una copia di "
-"<em>/var/lib/dpkg/status</em> della <em>macchina di destinazione</em>. "
-"Notare che, se si sta usando un archivio locale, si devono usare URI «copy» "
-"la cui sintassi è identica a quella degli URI «file»."
+"macchina remota e il file di stato dovrebbe essere una copia di <em>/var/lib/"
+"dpkg/status</em> della <em>macchina di destinazione</em>. Notare che, se si "
+"sta usando un archivio locale, si devono usare URI «copy» la cui sintassi è "
+"identica a quella degli URI «file»."
#. type: <p><example>
#: offline.sgml:100
@@ -9624,10 +9531,8 @@ msgid ""
msgstr ""
" APT\n"
" {\n"
-" /* Questo non è necessario se le due macchine hanno la stessa "
-"architettura,\n"
-" dice ad APT remoto qual è l'architettura della macchina di "
-"destinazione */\n"
+" /* Questo non è necessario se le due macchine hanno la stessa architettura,\n"
+" dice ad APT remoto qual è l'architettura della macchina di destinazione */\n"
" Architecture \"i386\";\n"
" \n"
" Get::Download-Only \"true\";\n"
@@ -9635,8 +9540,7 @@ msgstr ""
" \n"
" Dir\n"
" {\n"
-" /* Usa il disco per le informazioni sullo stato e ridirige il file di "
-"stato\n"
+" /* Usa il disco per le informazioni sullo stato e ridirige il file di stato\n"
" dalla posizione predefinita /var/lib/dpkg */\n"
" State \"/disc/\";\n"
" State::status \"status\";\n"
@@ -9656,8 +9560,8 @@ msgid ""
"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
msgstr ""
"Si possono vedere informazioni più dettagliate nella pagina di manuale di "
-"apt.conf e nel file di configurazione d'esempio in "
-"<em>/usr/share/doc/apt/examples/apt.conf</em>."
+"apt.conf e nel file di configurazione d'esempio in <em>/usr/share/doc/apt/"
+"examples/apt.conf</em>."
#. type: <p><example>
#: offline.sgml:136
@@ -9670,9 +9574,9 @@ msgid ""
msgstr ""
"Nella macchina di destinazione, la prima cosa da fare è montare il disco e "
"copiarvi <em>/var/lib/dpkg/status</em>. Sarà anche necessario creare le "
-"directory elencate nella panoramica: <em>archives/partial/</em> e "
-"<em>lists/partial/</em>. Poi portare il disco nella macchina remota e "
-"configurare il file sources.list; in tale macchina eseguire:"
+"directory elencate nella panoramica: <em>archives/partial/</em> e <em>lists/"
+"partial/</em>. Poi portare il disco nella macchina remota e configurare il "
+"file sources.list; in tale macchina eseguire:"
#. type: <example></example>
#: offline.sgml:142
@@ -9688,8 +9592,7 @@ msgstr ""
" # apt-get update\n"
" [ APT scarica i file degli elenchi dei pacchetti ]\n"
" # apt-get dist-upgrade\n"
-" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di "
-"destinazione ]"
+" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]"
#. type: </example></p>
#: offline.sgml:149
@@ -9780,9 +9683,9 @@ msgid ""
"packages."
msgstr ""
"L'idea di base è di creare un disco che ha solo i file degli archivi dei "
-"pacchetti, scaricati dal sito remoto. Ciò viene fatto usando l'opzione "
-"--print-uris di apt-get e poi preparando uno script che usa wget per "
-"scaricare effettivamente i pacchetti."
+"pacchetti, scaricati dal sito remoto. Ciò viene fatto usando l'opzione --"
+"print-uris di apt-get e poi preparando uno script che usa wget per scaricare "
+"effettivamente i pacchetti."
#. type: <heading></heading>
#: offline.sgml:196
@@ -9872,28 +9775,34 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
msgid "Which will use the already fetched archives on the disc."
msgstr "che userà gli archivi già scaricati e presenti sul disco."
-#, no-wrap
#~ msgid "Debian GNU/Linux"
#~ msgstr "Debian GNU/Linux"
-#, no-wrap
#~ msgid "OPTIONS"
#~ msgstr "OPZIONI"
#~ msgid "None."
#~ msgstr "Nessuna."
-#, no-wrap
#~ msgid "FILES"
#~ msgstr "FILE"
#~ msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
#~ msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-#~ msgid "<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex \"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-#~ msgstr "<!-- Alcuni percorsi comuni. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex \"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
+#~ msgid ""
+#~ "<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
+#~ "ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
+#~ "\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
+#~ "aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/"
+#~ "var/lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
+#~ msgstr ""
+#~ "<!-- Alcuni percorsi comuni. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> "
+#~ "<!ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
+#~ "\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
+#~ "aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/"
+#~ "var/lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-#, no-wrap
#~ msgid ""
#~ "<!-- Cross references to other man pages -->\n"
#~ "<!ENTITY apt-conf \"<citerefentry>\n"
@@ -9909,7 +9818,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-get \"<citerefentry>\n"
#~ " <refentrytitle><command>apt-get</command></refentrytitle>\n"
@@ -9923,7 +9831,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-config \"<citerefentry>\n"
#~ " <refentrytitle><command>apt-config</command></refentrytitle>\n"
@@ -9937,7 +9844,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-cdrom \"<citerefentry>\n"
#~ " <refentrytitle><command>apt-cdrom</command></refentrytitle>\n"
@@ -9951,7 +9857,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-cache \"<citerefentry>\n"
#~ " <refentrytitle><command>apt-cache</command></refentrytitle>\n"
@@ -9965,7 +9870,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-preferences \"<citerefentry>\n"
#~ " <refentrytitle><command>apt_preferences</command></refentrytitle>\n"
@@ -9979,7 +9883,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-key \"<citerefentry>\n"
#~ " <refentrytitle><command>apt-key</command></refentrytitle>\n"
@@ -9993,7 +9896,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-secure \"<citerefentry>\n"
#~ " <refentrytitle>apt-secure</refentrytitle>\n"
@@ -10007,7 +9909,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-ftparchive \"<citerefentry>\n"
#~ " <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n"
@@ -10021,7 +9922,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY sources-list \"<citerefentry>\n"
#~ " <refentrytitle><filename>sources.list</filename></refentrytitle>\n"
@@ -10035,7 +9935,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY reportbug \"<citerefentry>\n"
#~ " <refentrytitle><command>reportbug</command></refentrytitle>\n"
@@ -10049,7 +9948,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY dpkg \"<citerefentry>\n"
#~ " <refentrytitle><command>dpkg</command></refentrytitle>\n"
@@ -10063,7 +9961,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY dpkg-buildpackage \"<citerefentry>\n"
#~ " <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n"
@@ -10077,7 +9974,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY gzip \"<citerefentry>\n"
#~ " <refentrytitle><command>gzip</command></refentrytitle>\n"
@@ -10091,7 +9987,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
#~ " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
@@ -10105,7 +10000,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY dpkg-scansources \"<citerefentry>\n"
#~ " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
@@ -10119,7 +10013,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY dselect \"<citerefentry>\n"
#~ " <refentrytitle><command>dselect</command></refentrytitle>\n"
@@ -10133,7 +10026,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY aptitude \"<citerefentry>\n"
#~ " <refentrytitle><command>aptitude</command></refentrytitle>\n"
@@ -10147,7 +10039,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY synaptic \"<citerefentry>\n"
#~ " <refentrytitle><command>synaptic</command></refentrytitle>\n"
@@ -10161,7 +10052,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY debsign \"<citerefentry>\n"
#~ " <refentrytitle><command>debsign</command></refentrytitle>\n"
@@ -10175,7 +10065,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY debsig-verify \"<citerefentry>\n"
#~ " <refentrytitle><command>debsig-verify</command></refentrytitle>\n"
@@ -10189,7 +10078,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY gpg \"<citerefentry>\n"
#~ " <refentrytitle><command>gpg</command></refentrytitle>\n"
@@ -10203,7 +10091,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
#~ " <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
@@ -10217,7 +10104,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY wajig \"<citerefentry>\n"
#~ " <refentrytitle><command>wajig</command></refentrytitle>\n"
@@ -10231,7 +10117,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </citerefentry>\"\n"
#~ ">\n"
-#, no-wrap
#~ msgid ""
#~ "<!-- Boiler plate docinfo section -->\n"
#~ "<!ENTITY apt-docinfo \"\n"
@@ -10257,7 +10142,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <date>28 ottobre 2008</date>\n"
#~ " <productname>Linux</productname>\n"
-#, no-wrap
#~ msgid ""
#~ " </refentryinfo>\n"
#~ "\"> \n"
@@ -10265,7 +10149,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </refentryinfo>\n"
#~ "\"> \n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-email \"\n"
#~ " <address>\n"
@@ -10279,7 +10162,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </address>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-author.jgunthorpe \"\n"
#~ " <author>\n"
@@ -10297,7 +10179,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </author>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-author.moconnor \"\n"
#~ " <author>\n"
@@ -10315,7 +10196,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </author>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-product \"\n"
#~ " <productname>Linux</productname>\n"
@@ -10325,7 +10205,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <productname>Linux</productname>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ "<!ENTITY apt-copyright \"\n"
#~ " <copyright>\n"
@@ -10341,7 +10220,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </copyright>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ "<!-- Boiler plate Bug reporting section -->\n"
#~ "<!ENTITY manbugs \"\n"
@@ -10365,7 +10243,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </refsect1>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ " <varlistentry>\n"
#~ " <term><option>-c</option></term>\n"
@@ -10387,7 +10264,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </listitem>\n"
#~ " </varlistentry>\n"
-#, no-wrap
#~ msgid ""
#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
#~ " <listitem><para>Storage area for package files in transit.\n"
@@ -10401,7 +10277,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " </varlistentry>\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
#~ " <listitem><para>Storage area for state information in transit.\n"
@@ -10418,7 +10293,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "<!ENTITY translation-title \"TRANSLATION\">"
#~ msgstr "<!ENTITY translation-title \"TRANSLATION\">"
-#, no-wrap
#~ msgid ""
#~ "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
#~ " to the translation in the past, who is responsible now and maybe further information\n"
@@ -10439,7 +10313,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " chiunque vorrà unirsi (DA CORREGGERE ALLA FINE).\n"
#~ "\">\n"
-#, no-wrap
#~ msgid ""
#~ "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
#~ " in a shipped manpage will maybe appear english parts. -->\n"
@@ -10457,8 +10330,12 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " traduzione è più vecchia del contenuto originale.\n"
#~ "\">\n"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 February 2004</date>"
-#~ msgstr "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 February 2004</date>"
+#~ msgid ""
+#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#~ "<date>29 February 2004</date>"
+#~ msgstr ""
+#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#~ "<date>29 February 2004</date>"
#~ msgid "apt-cache"
#~ msgstr "apt-cache"
@@ -10466,20 +10343,73 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "APT package handling utility -- cache manipulator"
#~ msgstr "APT strumento di gestione pacchetti -- manipolatore di cache"
-#~ msgid "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-#~ msgstr "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-o=<replaceable>stringa di configurazione</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefisso</replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetti</replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetti</replaceable></arg></arg> </group>"
+#~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
+#~ "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
+#~ "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
+#~ "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~ "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>stringa di configurazione</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>file</replaceable></option></"
+#~ "arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</"
+#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacchetto</replaceable></arg></arg> <arg>stats</arg> "
+#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~ "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</"
+#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacchetto</replaceable></arg></arg> <arg>rdepends <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></"
+#~ "arg></arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefisso</"
+#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacchetto</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pacchetto</replaceable></arg></arg> "
+#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacchetti</"
+#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacchetti</replaceable></arg></arg> </group>"
#~ msgid "add <replaceable>file(s)</replaceable>"
#~ msgstr "add <replaceable>file</replaceable>"
-#~ msgid "<literal>add</literal> adds the named package index files to the package cache. This is for debugging only."
-#~ msgstr "<literal>add</literal> aggiunge i file di indice dei pacchetti menzionati alla cache dei pacchetti. Questo serve solo per fare il debug."
+#~ msgid ""
+#~ "<literal>add</literal> adds the named package index files to the package "
+#~ "cache. This is for debugging only."
+#~ msgstr ""
+#~ "<literal>add</literal> aggiunge i file di indice dei pacchetti menzionati "
+#~ "alla cache dei pacchetti. Questo serve solo per fare il debug."
#~ msgid "gencaches"
#~ msgstr "gencaches"
-#~ msgid "<literal>gencaches</literal> performs the same operation as <command>apt-get check</command>. It builds the source and package caches from the sources in &sources-list; and from <filename>/var/lib/dpkg/status</filename>."
-#~ msgstr "<literal>gencaches</literal> esegue la stessa operazione di <command>apt-get check</command>. Costruisce le cache sorgenti e pacchetti dalle fonti in &sources-list; e da <filename>/var/lib/dpkg/status</filename>."
+#~ msgid ""
+#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+#~ "get check</command>. It builds the source and package caches from the "
+#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+#~ "filename>."
+#~ msgstr ""
+#~ "<literal>gencaches</literal> esegue la stessa operazione di <command>apt-"
+#~ "get check</command>. Costruisce le cache sorgenti e pacchetti dalle fonti "
+#~ "in &sources-list; e da <filename>/var/lib/dpkg/status</filename>."
#~ msgid "showpkg <replaceable>pkg(s)</replaceable>"
#~ msgstr "showpkg <replaceable>pacchetti</replaceable>"
@@ -10487,23 +10417,71 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "stats"
#~ msgstr "stats"
-#~ msgid "<literal>Pure virtual packages</literal> is the number of packages that exist only as a virtual package name; that is, packages only \"provide\" the virtual package name, and no package actually uses the name. For instance, \"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual package; several packages provide \"mail-transport-agent\", but there is no package named \"mail-transport-agent\"."
-#~ msgstr "<literal>Pacchetti virtuali puri</literal> è il numero di pacchetti che esistono solo come nome di pacchetto virtuale; vale a dire, i pacchetti \"forniscono\" solo il nome del pacchetto virtuale e nessun pacchetto in realtà usa quel nome. Per esempio, \"mail-transport-agent\" nel sistema Debian GNU/Linux è un pacchetto virtuale puro; diversi pacchetti forniscono \"mail-transport-agent\", ma non c'è alcun pacchetto chiamato \"mail-transport-agent\"."
+#~ msgid ""
+#~ "<literal>Pure virtual packages</literal> is the number of packages that "
+#~ "exist only as a virtual package name; that is, packages only \"provide\" "
+#~ "the virtual package name, and no package actually uses the name. For "
+#~ "instance, \"mail-transport-agent\" in the Debian GNU/Linux system is a "
+#~ "pure virtual package; several packages provide \"mail-transport-agent\", "
+#~ "but there is no package named \"mail-transport-agent\"."
+#~ msgstr ""
+#~ "<literal>Pacchetti virtuali puri</literal> è il numero di pacchetti che "
+#~ "esistono solo come nome di pacchetto virtuale; vale a dire, i pacchetti "
+#~ "\"forniscono\" solo il nome del pacchetto virtuale e nessun pacchetto in "
+#~ "realtà usa quel nome. Per esempio, \"mail-transport-agent\" nel sistema "
+#~ "Debian GNU/Linux è un pacchetto virtuale puro; diversi pacchetti "
+#~ "forniscono \"mail-transport-agent\", ma non c'è alcun pacchetto chiamato "
+#~ "\"mail-transport-agent\"."
-#~ msgid "<literal>Single virtual packages</literal> is the number of packages with only one package providing a particular virtual package. For example, in the Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only one package, xless, provides \"X11-text-viewer\"."
-#~ msgstr "<literal>Pacchetti virtuali singoli</literal> è il numero di pacchetti per cui solo un pacchetto fornisce un particolare pacchetto virtuale. Per esempio, nel sistema Debian GNU/Linux, \"X11-text-viewer\" è un pacchetto virtuale, ma solo un pacchetto, xless, fornisce \"X11-text-viewer\"."
+#~ msgid ""
+#~ "<literal>Single virtual packages</literal> is the number of packages with "
+#~ "only one package providing a particular virtual package. For example, in "
+#~ "the Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, "
+#~ "but only one package, xless, provides \"X11-text-viewer\"."
+#~ msgstr ""
+#~ "<literal>Pacchetti virtuali singoli</literal> è il numero di pacchetti "
+#~ "per cui solo un pacchetto fornisce un particolare pacchetto virtuale. Per "
+#~ "esempio, nel sistema Debian GNU/Linux, \"X11-text-viewer\" è un pacchetto "
+#~ "virtuale, ma solo un pacchetto, xless, fornisce \"X11-text-viewer\"."
-#~ msgid "<literal>Mixed virtual packages</literal> is the number of packages that either provide a particular virtual package or have the virtual package name as the package name. For instance, in the Debian GNU/Linux system, \"debconf\" is both an actual package, and provided by the debconf-tiny package."
-#~ msgstr "<literal>Pacchetti virtuali misti</literal> è il numero di pacchetti che forniscono un particolare pacchetto virtuale o che hanno il nome del pacchetto virtuale come nome del pacchetto. Per esempio, nel sistema Debian GNU/Linux , \"debconf\" è sia un pacchetto vero e proprio sia fornito dal pacchetto debconf-tiny."
+#~ msgid ""
+#~ "<literal>Mixed virtual packages</literal> is the number of packages that "
+#~ "either provide a particular virtual package or have the virtual package "
+#~ "name as the package name. For instance, in the Debian GNU/Linux system, "
+#~ "\"debconf\" is both an actual package, and provided by the debconf-tiny "
+#~ "package."
+#~ msgstr ""
+#~ "<literal>Pacchetti virtuali misti</literal> è il numero di pacchetti che "
+#~ "forniscono un particolare pacchetto virtuale o che hanno il nome del "
+#~ "pacchetto virtuale come nome del pacchetto. Per esempio, nel sistema "
+#~ "Debian GNU/Linux , \"debconf\" è sia un pacchetto vero e proprio sia "
+#~ "fornito dal pacchetto debconf-tiny."
-#~ msgid "<literal>Total distinct</literal> versions is the number of package versions found in the cache; this value is therefore at least equal to the number of total package names. If more than one distribution (both \"stable\" and \"unstable\", for instance), is being accessed, this value can be considerably larger than the number of total package names."
-#~ msgstr "<literal>Totale versioni distinte</literal> è il numero di versioni di pacchetti trovate nella cache; questo valore pertanto è almeno pari al numero dei nomi totali di pacchetto. Se si ha accesso a più di una distribuzione (ad esempio sia \"stable\" che \"unstable\"), questo valore può essere decisamente più grande del numero dei nomi totali di pacchetti."
+#~ msgid ""
+#~ "<literal>Total distinct</literal> versions is the number of package "
+#~ "versions found in the cache; this value is therefore at least equal to "
+#~ "the number of total package names. If more than one distribution (both "
+#~ "\"stable\" and \"unstable\", for instance), is being accessed, this value "
+#~ "can be considerably larger than the number of total package names."
+#~ msgstr ""
+#~ "<literal>Totale versioni distinte</literal> è il numero di versioni di "
+#~ "pacchetti trovate nella cache; questo valore pertanto è almeno pari al "
+#~ "numero dei nomi totali di pacchetto. Se si ha accesso a più di una "
+#~ "distribuzione (ad esempio sia \"stable\" che \"unstable\"), questo valore "
+#~ "può essere decisamente più grande del numero dei nomi totali di pacchetti."
#~ msgid "showsrc <replaceable>pkg(s)</replaceable>"
#~ msgstr "showsrc <replaceable>pacchetti</replaceable>"
-#~ msgid "<literal>showsrc</literal> displays all the source package records that match the given package names. All versions are shown, as well as all records that declare the name to be a Binary."
-#~ msgstr "<literal>showsrc</literal> mostra tutti i pacchetti sorgente che combaciano coi nomi dei pacchetti dati. Vengono mostrate tutte le versioni, così come tutti i record che dichiarano che il nome è un pacchetto binario."
+#~ msgid ""
+#~ "<literal>showsrc</literal> displays all the source package records that "
+#~ "match the given package names. All versions are shown, as well as all "
+#~ "records that declare the name to be a Binary."
+#~ msgstr ""
+#~ "<literal>showsrc</literal> mostra tutti i pacchetti sorgente che "
+#~ "combaciano coi nomi dei pacchetti dati. Vengono mostrate tutte le "
+#~ "versioni, così come tutti i record che dichiarano che il nome è un "
+#~ "pacchetto binario."
#~ msgid "dump"
#~ msgstr "dump"
@@ -10520,8 +10498,29 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "search <replaceable>regex [ regex ... ]</replaceable>"
#~ msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
-#~ msgid "<literal>search</literal> performs a full text search on all available package lists for the POSIX regex pattern given, see <citerefentry><refentrytitle><command>regex</command></refentrytitle> <manvolnum>7</manvolnum></citerefentry>. It searches the package names and the descriptions for an occurrence of the regular expression and prints out the package name and the short description, including virtual package names. If <option>--full</option> is given then output identical to <literal>show</literal> is produced for each matched package, and if <option>--names-only</option> is given then the long description is not searched, only the package name is."
-#~ msgstr "<literal>search</literal> esegue una ricerca completa del testo su tutte le liste di pacchetti disponibili cercando il modellp di regexp POSIX fornito; vedere <citerefentry><refentrytitle><command>regex</command></refentrytitle> <manvolnum>7</manvolnum></citerefentry>. Cerca le occorrenze dell'expressione regolare nei nomi e nelle descrizioni dei pacchetti e stampa il nome e la descrizione breve dei pacchetti, inclusi quelli virtuali. Se viene fornita l'opzione <option>--full</option>, il risultato è identico a <literal>show</literal> per ciascun pacchetto che soddisfa la ricerca; se viene fornita l'opzione <option>--names-only</option> la ricerca viene fatta solo sul nome del pacchetto e non sulla descrizione lunga."
+#~ msgid ""
+#~ "<literal>search</literal> performs a full text search on all available "
+#~ "package lists for the POSIX regex pattern given, see "
+#~ "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#~ "<manvolnum>7</manvolnum></citerefentry>. It searches the package names "
+#~ "and the descriptions for an occurrence of the regular expression and "
+#~ "prints out the package name and the short description, including virtual "
+#~ "package names. If <option>--full</option> is given then output identical "
+#~ "to <literal>show</literal> is produced for each matched package, and if "
+#~ "<option>--names-only</option> is given then the long description is not "
+#~ "searched, only the package name is."
+#~ msgstr ""
+#~ "<literal>search</literal> esegue una ricerca completa del testo su tutte "
+#~ "le liste di pacchetti disponibili cercando il modellp di regexp POSIX "
+#~ "fornito; vedere <citerefentry><refentrytitle><command>regex</command></"
+#~ "refentrytitle> <manvolnum>7</manvolnum></citerefentry>. Cerca le "
+#~ "occorrenze dell'expressione regolare nei nomi e nelle descrizioni dei "
+#~ "pacchetti e stampa il nome e la descrizione breve dei pacchetti, inclusi "
+#~ "quelli virtuali. Se viene fornita l'opzione <option>--full</option>, il "
+#~ "risultato è identico a <literal>show</literal> per ciascun pacchetto che "
+#~ "soddisfa la ricerca; se viene fornita l'opzione <option>--names-only</"
+#~ "option> la ricerca viene fatta solo sul nome del pacchetto e non sulla "
+#~ "descrizione lunga."
#~ msgid "depends <replaceable>pkg(s)</replaceable>"
#~ msgstr "depends <replaceable>pacchetti</replaceable>"
@@ -10535,8 +10534,17 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "dotty <replaceable>pkg(s)</replaceable>"
#~ msgstr "dotty <replaceable>pacchetti</replaceable>"
-#~ msgid "The resulting nodes will have several shapes; normal packages are boxes, pure provides are triangles, mixed provides are diamonds, missing packages are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue lines are pre-depends, green lines are conflicts."
-#~ msgstr "I nodi risultanti avranno diverse forme: i pacchetti normali sono quadrati, quelli forniti puri sono triangoli, quelli forniti misti sono rombi, i pacchetti mancanti sono esagoni. I quadrati arancioni indicano che la ricorsione è stata arrestata [pacchetti foglia], le linee blu sono pre-dipendenze, le linee verdi sono conflitti."
+#~ msgid ""
+#~ "The resulting nodes will have several shapes; normal packages are boxes, "
+#~ "pure provides are triangles, mixed provides are diamonds, missing "
+#~ "packages are hexagons. Orange boxes mean recursion was stopped [leaf "
+#~ "packages], blue lines are pre-depends, green lines are conflicts."
+#~ msgstr ""
+#~ "I nodi risultanti avranno diverse forme: i pacchetti normali sono "
+#~ "quadrati, quelli forniti puri sono triangoli, quelli forniti misti sono "
+#~ "rombi, i pacchetti mancanti sono esagoni. I quadrati arancioni indicano "
+#~ "che la ricorsione è stata arrestata [pacchetti foglia], le linee blu sono "
+#~ "pre-dipendenze, le linee verdi sono conflitti."
#~ msgid "xvcg <replaceable>pkg(s)</replaceable>"
#~ msgstr "xvcg <replaceable>pacchetti</replaceable>"
@@ -10571,8 +10579,14 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "<option>--important</option>"
#~ msgstr "<option>--important</option>"
-#~ msgid "Print only important dependencies; for use with unmet and depends. Causes only Depends and Pre-Depends relations to be printed. Configuration Item: <literal>APT::Cache::Important</literal>."
-#~ msgstr "Stampa solo le dipendenze importanti; da usarsi con unmet e depends. Fa sì che vengano stampate solo le relazioni di Depends e Pre-Depends. Voce di configurazione: <literal>APT::Cache::Important</literal>."
+#~ msgid ""
+#~ "Print only important dependencies; for use with unmet and depends. Causes "
+#~ "only Depends and Pre-Depends relations to be printed. Configuration "
+#~ "Item: <literal>APT::Cache::Important</literal>."
+#~ msgstr ""
+#~ "Stampa solo le dipendenze importanti; da usarsi con unmet e depends. Fa "
+#~ "sì che vengano stampate solo le relazioni di Depends e Pre-Depends. Voce "
+#~ "di configurazione: <literal>APT::Cache::Important</literal>."
#~ msgid "<option>-f</option>"
#~ msgstr "<option>-f</option>"
@@ -10586,8 +10600,21 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "<option>--all-versions</option>"
#~ msgstr "<option>--all-versions</option>"
-#~ msgid "Print full records for all available versions. This is the default; to turn it off, use <option>--no-all-versions</option>. If <option>--no-all-versions</option> is specified, only the candidate version will displayed (the one which would be selected for installation). This option is only applicable to the <literal>show</literal> command. Configuration Item: <literal>APT::Cache::AllVersions</literal>."
-#~ msgstr "Stampa i record completi per tutte le versioni disponibili. Questa è l'impostazione predefinita; per disattivarla, usare <option>--no-all-versions</option>. Se si specifica <option>--no-all-versions</option>, verrà visualizzata solo la versione candidata (quella che sarebbe scelta per l'installazione). Questa opzione è applicabile solo al comando <literal>show</literal>. Voce di configurazione: <literal>APT::Cache::AllVersions</literal>."
+#~ msgid ""
+#~ "Print full records for all available versions. This is the default; to "
+#~ "turn it off, use <option>--no-all-versions</option>. If <option>--no-all-"
+#~ "versions</option> is specified, only the candidate version will displayed "
+#~ "(the one which would be selected for installation). This option is only "
+#~ "applicable to the <literal>show</literal> command. Configuration Item: "
+#~ "<literal>APT::Cache::AllVersions</literal>."
+#~ msgstr ""
+#~ "Stampa i record completi per tutte le versioni disponibili. Questa è "
+#~ "l'impostazione predefinita; per disattivarla, usare <option>--no-all-"
+#~ "versions</option>. Se si specifica <option>--no-all-versions</option>, "
+#~ "verrà visualizzata solo la versione candidata (quella che sarebbe scelta "
+#~ "per l'installazione). Questa opzione è applicabile solo al comando "
+#~ "<literal>show</literal>. Voce di configurazione: <literal>APT::Cache::"
+#~ "AllVersions</literal>."
#~ msgid "<option>-g</option>"
#~ msgstr "<option>-g</option>"
@@ -10616,8 +10643,12 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "&file-sourceslist; &file-statelists;"
#~ msgstr "&file-sourceslist; &file-statelists;"
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 February 2004</date>"
-#~ msgstr "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 febbraio 2004</date>"
+#~ msgid ""
+#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#~ "<date>14 February 2004</date>"
+#~ msgstr ""
+#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#~ "<date>14 febbraio 2004</date>"
#~ msgid "apt-cdrom"
#~ msgstr "apt-cdrom"
@@ -10625,29 +10656,78 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "APT CDROM management utility"
#~ msgstr "Strumento di APT per la gestione dei CDROM"
-#~ msgid "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> <arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> <arg><option>-d=<replaceable>punto di mount del cdrom</replaceable></option></arg> <arg><option>-o=<replaceable>stringa di configurazione</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>punto di mount del cdrom</replaceable></"
+#~ "option></arg> <arg><option>-o=<replaceable>stringa di configurazione</"
+#~ "replaceable></option></arg> <arg><option>-c=<replaceable>file</"
+#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </"
+#~ "group>"
-#~ msgid "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of available sources. <command>apt-cdrom</command> takes care of determining the structure of the disc as well as correcting for several possible mis-burns and verifying the index files."
-#~ msgstr "<command>apt-cdrom</command> è usato per aggiungere un nuovo CDROM alla lista di sorgenti disponibili di APT. <command>apt-cdrom</command> si prende cura di determinare la struttura del disco e anche di correggere possibili errori di masterizzazione e verificare i file indice."
+#~ msgid ""
+#~ "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+#~ "available sources. <command>apt-cdrom</command> takes care of determining "
+#~ "the structure of the disc as well as correcting for several possible mis-"
+#~ "burns and verifying the index files."
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> è usato per aggiungere un nuovo CDROM alla "
+#~ "lista di sorgenti disponibili di APT. <command>apt-cdrom</command> si "
+#~ "prende cura di determinare la struttura del disco e anche di correggere "
+#~ "possibili errori di masterizzazione e verificare i file indice."
-#~ msgid "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT system, it cannot be done by hand. Furthermore each disk in a multi-cd set must be inserted and scanned separately to account for possible mis-burns."
-#~ msgstr "Per aggiungere CD al sistema APT è necessario usare <command>apt-cdrom</command>, in quanto ciò non può essere fatto manualmente. Inoltre ogni disco in un insieme di più CD deve essere inserito e scansionato separatamente per tenere conto di possibili errori di masterizzazione."
+#~ msgid ""
+#~ "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
+#~ "system, it cannot be done by hand. Furthermore each disk in a multi-cd "
+#~ "set must be inserted and scanned separately to account for possible mis-"
+#~ "burns."
+#~ msgstr ""
+#~ "Per aggiungere CD al sistema APT è necessario usare <command>apt-cdrom</"
+#~ "command>, in quanto ciò non può essere fatto manualmente. Inoltre ogni "
+#~ "disco in un insieme di più CD deve essere inserito e scansionato "
+#~ "separatamente per tenere conto di possibili errori di masterizzazione."
#~ msgid "add"
#~ msgstr "add"
-#~ msgid "<literal>add</literal> is used to add a new disc to the source list. It will unmount the CDROM device, prompt for a disk to be inserted and then proceed to scan it and copy the index files. If the disc does not have a proper <filename>disk</filename> directory you will be prompted for a descriptive title."
-#~ msgstr "<literal>add</literal> è usato per aggiungere un nuovo CDROM alla lista delle sorgenti. Smonterà il device del CDROM, chiederà di inserire un disco e poi procederà alla scansione del cdrom e copierà i file indice. Se il disco non ha una directory <filename>.disk/</filename> corretta verrà chiesto un titolo descrittivo."
+#~ msgid ""
+#~ "<literal>add</literal> is used to add a new disc to the source list. It "
+#~ "will unmount the CDROM device, prompt for a disk to be inserted and then "
+#~ "proceed to scan it and copy the index files. If the disc does not have a "
+#~ "proper <filename>disk</filename> directory you will be prompted for a "
+#~ "descriptive title."
+#~ msgstr ""
+#~ "<literal>add</literal> è usato per aggiungere un nuovo CDROM alla lista "
+#~ "delle sorgenti. Smonterà il device del CDROM, chiederà di inserire un "
+#~ "disco e poi procederà alla scansione del cdrom e copierà i file indice. "
+#~ "Se il disco non ha una directory <filename>.disk/</filename> corretta "
+#~ "verrà chiesto un titolo descrittivo."
-#~ msgid "APT uses a CDROM ID to track which disc is currently in the drive and maintains a database of these IDs in <filename>&statedir;/cdroms.list</filename>"
-#~ msgstr "APT usa un identificatore del CDROM per tenere traccia di quale disco è attualmente nel lettore e mantiene un database di questi identificativi nel file <filename>&statedir;/cdroms.list</filename>."
+#~ msgid ""
+#~ "APT uses a CDROM ID to track which disc is currently in the drive and "
+#~ "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
+#~ "filename>"
+#~ msgstr ""
+#~ "APT usa un identificatore del CDROM per tenere traccia di quale disco è "
+#~ "attualmente nel lettore e mantiene un database di questi identificativi "
+#~ "nel file <filename>&statedir;/cdroms.list</filename>."
#~ msgid "ident"
#~ msgstr "ident"
-#~ msgid "Unless the <option>-h</option>, or <option>--help</option> option is given one of the commands below must be present. <placeholder type=\"variablelist\" id=\"0\"/>"
-#~ msgstr "A meno che non venga fornita l'opzione <option>-h</option> o <option>--help</option>, deve essere presente uno dei comandi seguenti. <placeholder type=\"variablelist\" id=\"0\"/>"
+#~ msgid ""
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present. <placeholder type="
+#~ "\"variablelist\" id=\"0\"/>"
+#~ msgstr ""
+#~ "A meno che non venga fornita l'opzione <option>-h</option> o <option>--"
+#~ "help</option>, deve essere presente uno dei comandi seguenti. "
+#~ "<placeholder type=\"variablelist\" id=\"0\"/>"
#~ msgid "<option>-d</option>"
#~ msgstr "<option>-d</option>"
@@ -10655,8 +10735,15 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "<option>--cdrom</option>"
#~ msgstr "<option>--cdrom</option>"
-#~ msgid "Mount point; specify the location to mount the cdrom. This mount point must be listed in <filename>/etc/fstab</filename> and properly configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
-#~ msgstr "Punto di mount; specifica la posizione in cui montare il CDROM. Questo punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> e configurato correttamente. Voce di configurazione: <literal>Acquire::cdrom::mount</literal>."
+#~ msgid ""
+#~ "Mount point; specify the location to mount the cdrom. This mount point "
+#~ "must be listed in <filename>/etc/fstab</filename> and properly "
+#~ "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+#~ msgstr ""
+#~ "Punto di mount; specifica la posizione in cui montare il CDROM. Questo "
+#~ "punto di mount deve essere elencato nel file <filename>/etc/fstab</"
+#~ "filename> e configurato correttamente. Voce di configurazione: "
+#~ "<literal>Acquire::cdrom::mount</literal>."
#~ msgid "<option>-r</option>"
#~ msgstr "<option>-r</option>"
@@ -10664,8 +10751,15 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "<option>--rename</option>"
#~ msgstr "<option>--rename</option>"
-#~ msgid "Rename a disc; change the label of a disk or override the disks given label. This option will cause <command>apt-cdrom</command> to prompt for a new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
-#~ msgstr "Rinomina un disco; cambia l'etichetta di un disco o soppianta l'etichetta originale del disco. Questa opzione farà sì che <command>apt-cdrom</command> chieda una nuova etichetta. Voce di configurazione: <literal>APT::CDROM::Rename</literal>."
+#~ msgid ""
+#~ "Rename a disc; change the label of a disk or override the disks given "
+#~ "label. This option will cause <command>apt-cdrom</command> to prompt for "
+#~ "a new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
+#~ msgstr ""
+#~ "Rinomina un disco; cambia l'etichetta di un disco o soppianta l'etichetta "
+#~ "originale del disco. Questa opzione farà sì che <command>apt-cdrom</"
+#~ "command> chieda una nuova etichetta. Voce di configurazione: "
+#~ "<literal>APT::CDROM::Rename</literal>."
#~ msgid "<option>-m</option>"
#~ msgstr "<option>-m</option>"
@@ -10691,32 +10785,83 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "apt-config"
#~ msgstr "apt-config"
-#~ msgid "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-o=<replaceable>stringa di configurazione</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>stringa di configurazione</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>file</replaceable></option></"
+#~ "arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgid "<command>apt-config</command> is an internal program used by various portions of the APT suite to provide consistent configurability. It accesses the main configuration file <filename>/etc/apt/apt.conf</filename> in a manner that is easy to use by scripted applications."
-#~ msgstr "<command>apt-config</command> è un programma interno usato da varie parti della suite APT per fornire una configurabiità coerente. Accede al file principale di configurazione <filename>/etc/apt/apt.conf</filename> in modo facile da usare da parte di applicazioni che girano sotto forma di script."
+#~ msgid ""
+#~ "<command>apt-config</command> is an internal program used by various "
+#~ "portions of the APT suite to provide consistent configurability. It "
+#~ "accesses the main configuration file <filename>/etc/apt/apt.conf</"
+#~ "filename> in a manner that is easy to use by scripted applications."
+#~ msgstr ""
+#~ "<command>apt-config</command> è un programma interno usato da varie parti "
+#~ "della suite APT per fornire una configurabiità coerente. Accede al file "
+#~ "principale di configurazione <filename>/etc/apt/apt.conf</filename> in "
+#~ "modo facile da usare da parte di applicazioni che girano sotto forma di "
+#~ "script."
-#~ msgid "Unless the <option>-h</option>, or <option>--help</option> option is given one of the commands below must be present."
-#~ msgstr "A meno che non venga fornita l'opzione <option>-h</option> o <option>--help</option>, deve essere presente uno dei comandi seguenti."
+#~ msgid ""
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present."
+#~ msgstr ""
+#~ "A meno che non venga fornita l'opzione <option>-h</option> o <option>--"
+#~ "help</option>, deve essere presente uno dei comandi seguenti."
#~ msgid "shell"
#~ msgstr "shell"
-#~ msgid "shell is used to access the configuration information from a shell script. It is given pairs of arguments, the first being a shell variable and the second the configuration value to query. As output it lists a series of shell assignments commands for each present value. In a shell script it should be used like:"
-#~ msgstr "shell viene usato per accedere alle informazioni di configurazione da parte di uno script di shell. Riceve coppie di argomenti, il primo dei quali è una variabile di shell e il secondo è il valore di configurazione da interrogare. Come risultato elenca una serie di comandi di assegnazione di shell per ciascun valore presente. In uno script di shell dovrebbe essere usato in modo simile a:"
+#~ msgid ""
+#~ "shell is used to access the configuration information from a shell "
+#~ "script. It is given pairs of arguments, the first being a shell variable "
+#~ "and the second the configuration value to query. As output it lists a "
+#~ "series of shell assignments commands for each present value. In a shell "
+#~ "script it should be used like:"
+#~ msgstr ""
+#~ "shell viene usato per accedere alle informazioni di configurazione da "
+#~ "parte di uno script di shell. Riceve coppie di argomenti, il primo dei "
+#~ "quali è una variabile di shell e il secondo è il valore di configurazione "
+#~ "da interrogare. Come risultato elenca una serie di comandi di "
+#~ "assegnazione di shell per ciascun valore presente. In uno script di shell "
+#~ "dovrebbe essere usato in modo simile a:"
#~ msgid "apt-extracttemplates"
#~ msgstr "apt-extracttemplates"
#~ msgid "Utility to extract DebConf config and templates from Debian packages"
-#~ msgstr "Utilità per estrarre configurazioni e modelli DebConf dai pacchetti Debian"
+#~ msgstr ""
+#~ "Utilità per estrarre configurazioni e modelli DebConf dai pacchetti Debian"
-#~ msgid "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> <arg><option>-t=<replaceable>temporary directory</replaceable></option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> <arg><option>-t=<replaceable>directory temporanea</replaceable></option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>directory temporanea</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
-#~ msgid "template-file and config-script are written to the temporary directory specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</literal>) directory, with filenames of the form <filename>package.template.XXXX</filename> and <filename>package.config.XXXX</filename>"
-#~ msgstr "file-template e script-di-configurazione sono scritti nella directory temporanea specificata da -t o --tempdir (<literal>APT::ExtractTemplates::TempDir</literal>) directory, con i nomi dei file nella forma <filename>pacchetto.template.XXXX</filename> e <filename>pacchetto.config.XXXX</filename>"
+#~ msgid ""
+#~ "template-file and config-script are written to the temporary directory "
+#~ "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#~ "TempDir</literal>) directory, with filenames of the form "
+#~ "<filename>package.template.XXXX</filename> and <filename>package.config."
+#~ "XXXX</filename>"
+#~ msgstr ""
+#~ "file-template e script-di-configurazione sono scritti nella directory "
+#~ "temporanea specificata da -t o --tempdir (<literal>APT::ExtractTemplates::"
+#~ "TempDir</literal>) directory, con i nomi dei file nella forma "
+#~ "<filename>pacchetto.template.XXXX</filename> e <filename>pacchetto.config."
+#~ "XXXX</filename>"
#~ msgid "<option>-t</option>"
#~ msgstr "<option>-t</option>"
@@ -10724,17 +10869,67 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "<option>--tempdir</option>"
#~ msgstr "<option>--tempdir</option>"
-#~ msgid "Temporary directory in which to write extracted debconf template files and config scripts. Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal>"
-#~ msgstr "Directory temporanea dove scrivere i file template di debconf e gli script di configurazione estratti. Voce di configurazione: <literal>APT::ExtractTemplates::TempDir</literal>."
+#~ msgid ""
+#~ "Temporary directory in which to write extracted debconf template files "
+#~ "and config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
+#~ "TempDir</literal>"
+#~ msgstr ""
+#~ "Directory temporanea dove scrivere i file template di debconf e gli "
+#~ "script di configurazione estratti. Voce di configurazione: <literal>APT::"
+#~ "ExtractTemplates::TempDir</literal>."
-#~ msgid "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 August 2009</date>"
-#~ msgstr "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 agosto 2009</date>"
+#~ msgid ""
+#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#~ "<date>17 August 2009</date>"
+#~ msgstr ""
+#~ "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+#~ "<date>17 agosto 2009</date>"
#~ msgid "apt-ftparchive"
#~ msgstr "apt-ftparchive"
-#~ msgid "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> <arg><option>--md5</option></arg> <arg><option>--delink</option></arg> <arg><option>--readonly</option></arg> <arg><option>--contents</option></arg> <arg><option>--arch <replaceable>architecture</replaceable></option></arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-#~ msgstr "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> <arg><option>--md5</option></arg> <arg><option>--delink</option></arg> <arg><option>--readonly</option></arg> <arg><option>--contents</option></arg> <arg><option>--arch <replaceable>architettura</replaceable></option></arg> <arg><option>-o <replaceable>configurazione</replaceable>=<replaceable>stringa</replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>percorso</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>prefisso del percorso</replaceable></arg></arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>percorso</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>prefisso del percorso</replaceable></arg></arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>percorso</replaceable></arg></arg> <arg>release <arg choice=\"plain\"><replaceable>percorso</replaceable></arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>file-di-configurazione</replaceable></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>sezione</replaceable></arg></arg> <arg>clean <arg choice=\"plain\"><replaceable>file-di-configurazione</replaceable></arg></arg> </group>"
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architettura</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>configurazione</"
+#~ "replaceable>=<replaceable>stringa</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>percorso</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>prefisso del percorso</replaceable></arg></"
+#~ "arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>percorso</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>prefisso del percorso</replaceable></arg></"
+#~ "arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>percorso</"
+#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
+#~ "\"><replaceable>percorso</replaceable></arg></arg> <arg>generate <arg "
+#~ "choice=\"plain\"><replaceable>file-di-configurazione</replaceable></arg> "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>sezione</replaceable></"
+#~ "arg></arg> <arg>clean <arg choice=\"plain\"><replaceable>file-di-"
+#~ "configurazione</replaceable></arg></arg> </group>"
#~ msgid "packages"
#~ msgstr "packages"
@@ -10748,11 +10943,37 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "release"
#~ msgstr "release"
-#~ msgid "The <literal>release</literal> command generates a Release file from a directory tree. It recursively searches the given directory for Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and md5sum.txt files. It then writes to stdout a Release file containing an MD5 digest and SHA1 digest for each file."
-#~ msgstr "Il comando <literal>release</literal> genera un file Release da un albero di directory. Cerca ricorivamente file Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release e md5sum.txt nella directory data. Quindi scrive su stdout un file Release che contiene un digest MD5 e SHA1 per ciascun file."
+#~ msgid ""
+#~ "The <literal>release</literal> command generates a Release file from a "
+#~ "directory tree. It recursively searches the given directory for Packages, "
+#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
+#~ "md5sum.txt files. It then writes to stdout a Release file containing an "
+#~ "MD5 digest and SHA1 digest for each file."
+#~ msgstr ""
+#~ "Il comando <literal>release</literal> genera un file Release da un albero "
+#~ "di directory. Cerca ricorivamente file Packages, Packages.gz, Packages."
+#~ "bz2, Sources, Sources.gz, Sources.bz2, Release e md5sum.txt nella "
+#~ "directory data. Quindi scrive su stdout un file Release che contiene un "
+#~ "digest MD5 e SHA1 per ciascun file."
-#~ msgid "Values for the additional metadata fields in the Release file are taken from the corresponding variables under <literal>APT::FTPArchive::Release</literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The supported fields are: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>, <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>."
-#~ msgstr "I valori dei campi di metadati aggiuntivi nel file Release sono presi dalle variabili corrispondenti sotto <literal>APT::FTPArchive::Release</literal>, ad esempio <literal>APT::FTPArchive::Release::Origin</literal>. I campi supportati sono: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>, <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>."
+#~ msgid ""
+#~ "Values for the additional metadata fields in the Release file are taken "
+#~ "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#~ "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
+#~ "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#~ "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#~ "<literal>Codename</literal>, <literal>Date</literal>, "
+#~ "<literal>Architectures</literal>, <literal>Components</literal>, "
+#~ "<literal>Description</literal>."
+#~ msgstr ""
+#~ "I valori dei campi di metadati aggiuntivi nel file Release sono presi "
+#~ "dalle variabili corrispondenti sotto <literal>APT::FTPArchive::Release</"
+#~ "literal>, ad esempio <literal>APT::FTPArchive::Release::Origin</"
+#~ "literal>. I campi supportati sono: <literal>Origin</literal>, "
+#~ "<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</"
+#~ "literal>, <literal>Codename</literal>, <literal>Date</literal>, "
+#~ "<literal>Architectures</literal>, <literal>Components</literal>, "
+#~ "<literal>Description</literal>."
#~ msgid "generate"
#~ msgstr "generate"
@@ -10760,8 +10981,11 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "clean"
#~ msgstr "clean"
-#~ msgid "The generate configuration has 4 separate sections, each described below."
-#~ msgstr "La configurazione di generate ha 4 sezioni separate, ciascuna delle quali è descritta sotto."
+#~ msgid ""
+#~ "The generate configuration has 4 separate sections, each described below."
+#~ msgstr ""
+#~ "La configurazione di generate ha 4 sezioni separate, ciascuna delle quali "
+#~ "è descritta sotto."
#~ msgid "Dir Section"
#~ msgstr "Sezione Dir"
@@ -10787,8 +11011,17 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "Packages::Compress"
#~ msgstr "Packages::Compress"
-#~ msgid "Sets the default compression schemes to use for the Package index files. It is a string that contains a space separated list of at least one of: '.' (no compression), 'gzip' and 'bzip2'. The default for all compression schemes is '. gzip'."
-#~ msgstr "Imposta gli schemi di compressione predefiniti da usare per i file indice dei pacchetti. È una stringa che contiene una lista separata da spazi contenente almeno uno fra \".\" (nessuna compressione), \"gzip\" e \"bzip2\". Il valore predefinito per tutti gli schemi di compressione è \"gzip\"."
+#~ msgid ""
+#~ "Sets the default compression schemes to use for the Package index files. "
+#~ "It is a string that contains a space separated list of at least one of: "
+#~ "'.' (no compression), 'gzip' and 'bzip2'. The default for all compression "
+#~ "schemes is '. gzip'."
+#~ msgstr ""
+#~ "Imposta gli schemi di compressione predefiniti da usare per i file indice "
+#~ "dei pacchetti. È una stringa che contiene una lista separata da spazi "
+#~ "contenente almeno uno fra \".\" (nessuna compressione), \"gzip\" e "
+#~ "\"bzip2\". Il valore predefinito per tutti gli schemi di compressione è "
+#~ "\"gzip\"."
#~ msgid "Packages::Extensions"
#~ msgstr "Packages::Extensions"
@@ -10835,8 +11068,18 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "Contents"
#~ msgstr "Contents"
-#~ msgid "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple Packages files to map onto a single Contents file (such as the default) then <command>apt-ftparchive</command> will integrate those package files together automatically."
-#~ msgstr "Imposta il file Contents di uscita. Il valore predefinito è <filename>$(DIST)/Contents-$(ARCH)</filename>. Se questa impostazione fa sì che più file Packages corrispondano a un solo file Contents (come con il valore predefinito) allora <command>apt-ftparchive</command> unirà automaticamente insieme questi file dei pacchetti."
+#~ msgid ""
+#~ "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-"
+#~ "$(ARCH)</filename>. If this setting causes multiple Packages files to map "
+#~ "onto a single Contents file (such as the default) then <command>apt-"
+#~ "ftparchive</command> will integrate those package files together "
+#~ "automatically."
+#~ msgstr ""
+#~ "Imposta il file Contents di uscita. Il valore predefinito è <filename>"
+#~ "$(DIST)/Contents-$(ARCH)</filename>. Se questa impostazione fa sì che più "
+#~ "file Packages corrispondano a un solo file Contents (come con il valore "
+#~ "predefinito) allora <command>apt-ftparchive</command> unirà "
+#~ "automaticamente insieme questi file dei pacchetti."
#~ msgid "Contents::Header"
#~ msgstr "Contents::Header"
@@ -10853,17 +11096,37 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "Tree Section"
#~ msgstr "Sezione Tree"
-#~ msgid "The <literal>Tree</literal> section takes a scope tag which sets the <literal>$(DIST)</literal> variable and defines the root of the tree (the path is prefixed by <literal>ArchiveDir</literal>). Typically this is a setting such as <filename>dists/woody</filename>."
-#~ msgstr "La sezione <literal>Tree</literal> prende un tag di ambito che imposta la variabile <literal>$(DIST)</literal> e definisce la radice dell'albero (il percorso viene prefissato da <literal>ArchiveDir</literal>). Di solito è un'impostazione simile a <filename>dists/woody</filename>."
+#~ msgid ""
+#~ "The <literal>Tree</literal> section takes a scope tag which sets the "
+#~ "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
+#~ "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a "
+#~ "setting such as <filename>dists/woody</filename>."
+#~ msgstr ""
+#~ "La sezione <literal>Tree</literal> prende un tag di ambito che imposta la "
+#~ "variabile <literal>$(DIST)</literal> e definisce la radice dell'albero "
+#~ "(il percorso viene prefissato da <literal>ArchiveDir</literal>). Di "
+#~ "solito è un'impostazione simile a <filename>dists/woody</filename>."
-#~ msgid "All of the settings defined in the <literal>TreeDefault</literal> section can be use in a <literal>Tree</literal> section as well as three new variables."
-#~ msgstr "Tutte le impostazioni definite nella sezione <literal>TreeDefault</literal> possono essere usate in una sezione <literal>Tree</literal>, oltre a tre nuove variabili."
+#~ msgid ""
+#~ "All of the settings defined in the <literal>TreeDefault</literal> section "
+#~ "can be use in a <literal>Tree</literal> section as well as three new "
+#~ "variables."
+#~ msgstr ""
+#~ "Tutte le impostazioni definite nella sezione <literal>TreeDefault</"
+#~ "literal> possono essere usate in una sezione <literal>Tree</literal>, "
+#~ "oltre a tre nuove variabili."
#~ msgid "Sections"
#~ msgstr "Sezioni"
-#~ msgid "This is a space separated list of sections which appear under the distribution, typically this is something like <literal>main contrib non-free</literal>"
-#~ msgstr "Questa è una lista di sezioni che appaiono sotto la distribuzione, separate da spazi; tipicamente è simile a <literal>main contrib non-free</literal>."
+#~ msgid ""
+#~ "This is a space separated list of sections which appear under the "
+#~ "distribution, typically this is something like <literal>main contrib non-"
+#~ "free</literal>"
+#~ msgstr ""
+#~ "Questa è una lista di sezioni che appaiono sotto la distribuzione, "
+#~ "separate da spazi; tipicamente è simile a <literal>main contrib non-free</"
+#~ "literal>."
#~ msgid "Architectures"
#~ msgstr "Architetture"
@@ -10892,8 +11155,18 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgid "FileList, SourceFileList"
#~ msgstr "FileList, SourceFileList"
-#~ msgid "The binary override file is fully compatible with &dpkg-scanpackages;. It contains 4 fields separated by spaces. The first field is the package name, the second is the priority to force that package to, the third is the the section to force that package to and the final field is the maintainer permutation field."
-#~ msgstr "Il file override binario è completamente compatibile con &dpkg-scanpackages;. Contiene 4 campi separati da spazi. Il primo campo è il nome del pacchetto, il secondo è la priorità a cui forzare quel pacchetto, il terzo è la sezione in cui forzare quel pacchetto e l'ultimo campo è il campo di permutazione del manutentore."
+#~ msgid ""
+#~ "The binary override file is fully compatible with &dpkg-scanpackages;. It "
+#~ "contains 4 fields separated by spaces. The first field is the package "
+#~ "name, the second is the priority to force that package to, the third is "
+#~ "the the section to force that package to and the final field is the "
+#~ "maintainer permutation field."
+#~ msgstr ""
+#~ "Il file override binario è completamente compatibile con &dpkg-"
+#~ "scanpackages;. Contiene 4 campi separati da spazi. Il primo campo è il "
+#~ "nome del pacchetto, il secondo è la priorità a cui forzare quel "
+#~ "pacchetto, il terzo è la sezione in cui forzare quel pacchetto e l'ultimo "
+#~ "campo è il campo di permutazione del manutentore."
#, fuzzy
#~ msgid "update"
@@ -10908,9 +11181,31 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgstr "apt-get"
#, fuzzy
-#~ msgid "For more details, on Debian GNU/Linux systems, see the file /usr/share/common-licenses/GPL for the full license."
-#~ msgstr "Per ulteriori dettagli sui sistemi GNU/Linux si veda il testo completo della licenza nel file /usr/share/common-licenses/GPL."
+#~ msgid ""
+#~ "For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+#~ "common-licenses/GPL for the full license."
+#~ msgstr ""
+#~ "Per ulteriori dettagli sui sistemi GNU/Linux si veda il testo completo "
+#~ "della licenza nel file /usr/share/common-licenses/GPL."
#, fuzzy
-#~ msgid "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> and then choose the APT method. You will be prompted for a set of <em>Sources</em> which are places to fetch archives from. These can be remote Internet sites, local Debian mirrors or CDROMs. Each source can provide a fragment of the total Debian archive, APT will automatically combine them to form a complete set of packages. If you have a CDROM then it is a good idea to specify it first and then specify a mirror so that you have access to the latest bug fixes. APT will automatically use packages on your CDROM before downloading from the Internet."
-#~ msgstr "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti (<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Tali fonti possono essere siti Internet remoti, mirror locali di Debian o CDROM; ciascuna di esse può fornire una parte dell'archivio Debian, ed APT le combinerà insieme in un set completo di pacchetti. Se avete un CDROM è una buona idea indicare quello per primo, e poi i mirror, in modo da avere accesso alle ultime versioni; APT userà in questo modo automaticamente i pacchetti sul CDROM prima di scaricarli da Internet."
+#~ msgid ""
+#~ "To enable the APT method you need to select [A]ccess in <prgn>dselect</"
+#~ "prgn> and then choose the APT method. You will be prompted for a set of "
+#~ "<em>Sources</em> which are places to fetch archives from. These can be "
+#~ "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+#~ "provide a fragment of the total Debian archive, APT will automatically "
+#~ "combine them to form a complete set of packages. If you have a CDROM then "
+#~ "it is a good idea to specify it first and then specify a mirror so that "
+#~ "you have access to the latest bug fixes. APT will automatically use "
+#~ "packages on your CDROM before downloading from the Internet."
+#~ msgstr ""
+#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
+#~ "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
+#~ "(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Tali "
+#~ "fonti possono essere siti Internet remoti, mirror locali di Debian o "
+#~ "CDROM; ciascuna di esse può fornire una parte dell'archivio Debian, ed "
+#~ "APT le combinerà insieme in un set completo di pacchetti. Se avete un "
+#~ "CDROM è una buona idea indicare quello per primo, e poi i mirror, in modo "
+#~ "da avere accesso alle ultime versioni; APT userà in questo modo "
+#~ "automaticamente i pacchetti sul CDROM prima di scaricarli da Internet."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 8549d4bb6..1c8f4cdef 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 22:07+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1530,14 +1530,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "ファイル"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -4101,13 +4101,23 @@ msgstr ""
"Translation ファイルを、リストの最後 (暗黙の \"<literal>none</literal>\" の"
"後) に追加します。"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr "ディレクトリ"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4126,7 +4136,7 @@ msgstr ""
"サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4147,7 +4157,7 @@ msgstr ""
"様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4161,7 +4171,7 @@ msgstr ""
"ファイルを指定された場合のみ、この設定の効果があります)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4172,7 +4182,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4189,7 +4199,7 @@ msgstr ""
"プログラムの場所を指定します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4209,7 +4219,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4225,12 +4235,12 @@ msgstr ""
"フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr "DSelect での APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4241,7 +4251,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4262,7 +4272,7 @@ msgstr ""
"パッケージをダウンロードする直前に行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4271,7 +4281,7 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4280,7 +4290,7 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4289,12 +4299,12 @@ msgstr ""
"します。デフォルトはエラーが発生した場合のみです。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr "APT が &dpkg; を呼ぶ方法"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4303,7 +4313,7 @@ msgstr ""
"<literal>DPkg</literal> セクションにあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4313,7 +4323,7 @@ msgstr ""
"なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4325,7 +4335,7 @@ msgstr ""
"bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4340,7 +4350,7 @@ msgstr ""
"マンドの標準入力に送ります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4355,7 +4365,7 @@ msgstr ""
"Install-Pkgs</literal> で与えられるコマンドです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4364,7 +4374,7 @@ msgstr ""
"<filename>/</filename> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4373,12 +4383,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr "dpkg トリガの使い方 (および関連オプション)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4402,7 +4412,7 @@ msgstr ""
"(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4416,7 +4426,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4439,7 +4449,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4459,7 +4469,7 @@ msgstr ""
"在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4486,7 +4496,7 @@ msgstr ""
"能性があるからです。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4503,7 +4513,7 @@ msgstr ""
"では、最後以外のすべての実行で、無効にできます。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4518,7 +4528,7 @@ msgstr ""
"ことに注意してください。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4536,7 +4546,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4559,12 +4569,12 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4577,12 +4587,12 @@ msgstr ""
"トは、このスクリプトの先頭を参照してください。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4598,7 +4608,7 @@ msgstr ""
"のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4609,7 +4619,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4620,7 +4630,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4632,7 +4642,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4641,34 +4651,34 @@ msgstr ""
"ないようにします。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr "以下は apt に対するデバッグオプションのすべてです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4676,7 +4686,7 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4685,12 +4695,12 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4698,7 +4708,7 @@ msgstr ""
"<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4708,7 +4718,7 @@ msgstr ""
"システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4717,13 +4727,13 @@ msgstr ""
"<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4732,7 +4742,7 @@ msgstr ""
"ジやエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4741,7 +4751,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4750,14 +4760,14 @@ msgstr ""
"リストへのパッチ適用に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -4766,7 +4776,7 @@ msgstr ""
"に出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4781,7 +4791,7 @@ msgstr ""
"路に対応しています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -4810,7 +4820,7 @@ msgstr ""
"ます。<literal>section</literal> はパッケージが現れるセクション名です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -4819,7 +4829,7 @@ msgstr ""
"切られます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -4828,7 +4838,7 @@ msgstr ""
"を解析中に発生したエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -4837,18 +4847,18 @@ msgstr ""
"のトレースを生成します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr "起動時の各パッケージの優先度を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -4857,7 +4867,7 @@ msgstr ""
"した場合にのみ、適用されます)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -4868,7 +4878,7 @@ msgstr ""
"説明したものと同じです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -4877,13 +4887,13 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "サンプル"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -4893,7 +4903,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index c6dbde448..9be82667e 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1613,14 +1613,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "Pliki"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3981,13 +3981,23 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3999,7 +4009,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4012,7 +4022,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4022,7 +4032,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4030,7 +4040,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4041,7 +4051,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4054,7 +4064,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4065,12 +4075,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4078,7 +4088,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4091,40 +4101,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4132,7 +4142,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4141,7 +4151,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4151,7 +4161,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4161,26 +4171,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4195,7 +4205,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4209,7 +4219,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4223,7 +4233,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4236,7 +4246,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4253,7 +4263,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4264,7 +4274,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4274,7 +4284,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4292,7 +4302,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4306,12 +4316,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4320,13 +4330,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
#, fuzzy
msgid "Debug options"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4337,7 +4347,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4345,7 +4355,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4353,7 +4363,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4363,7 +4373,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4373,59 +4383,59 @@ msgstr ""
"in CDROM IDs."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4433,53 +4443,53 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4489,7 +4499,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -4507,46 +4517,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -4554,20 +4564,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Przykłady"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -4575,7 +4585,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index da1af2149..6beff2223 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 22:07+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -1566,14 +1566,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -4243,13 +4243,23 @@ msgstr ""
"filename> serão adicionados ao final da lista (após um \"<literal>none</"
"literal>\" implícito)."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr "Directórios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4268,7 +4278,7 @@ msgstr ""
"items que não começam com <filename>/</filename> ou <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4290,7 +4300,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4305,7 +4315,7 @@ msgstr ""
"ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4316,7 +4326,7 @@ msgstr ""
"estar feito então é carregado o ficheiro de configuração principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4334,7 +4344,7 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4355,7 +4365,7 @@ msgstr ""
"procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4373,12 +4383,12 @@ msgstr ""
"expressão regular."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr "APT em DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4389,7 +4399,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4411,7 +4421,7 @@ msgstr ""
"pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4420,7 +4430,7 @@ msgstr ""
"comandos quando é corrido para a fase de instalação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4429,7 +4439,7 @@ msgstr ""
"comandos quando é executado para a fase de actualização."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4438,12 +4448,12 @@ msgstr ""
"continuar. A predefinição é avisar apenas em caso de erro."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr "Como o APT chama o &dpkg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4452,7 +4462,7 @@ msgstr ""
"&dpkg;. Estas estão na secção <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -4463,7 +4473,7 @@ msgstr ""
"um argumento único ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4476,7 +4486,7 @@ msgstr ""
"bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4492,7 +4502,7 @@ msgstr ""
"instalar, um por cada linha na entrada standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4507,7 +4517,7 @@ msgstr ""
"dado ao <literal>Pre-Install-Pkgs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4516,7 +4526,7 @@ msgstr ""
"predefinição é <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4525,12 +4535,12 @@ msgstr ""
"predefinição é desactivar a assinatura e produzir todos os binários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr "Utilização trigger do dpkg (e opções relacionadas)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4556,7 +4566,7 @@ msgstr ""
"100% enquanto na realidade está a configurar todos os pacotes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4570,7 +4580,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -4594,7 +4604,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -4616,7 +4626,7 @@ msgstr ""
"chamadas unpack e remove."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4646,7 +4656,7 @@ msgstr ""
"arrancar."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4664,7 +4674,7 @@ msgstr ""
"esta opção em todas excepto na última execução."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4680,7 +4690,7 @@ msgstr ""
"configurar este pacote."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4698,7 +4708,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4722,12 +4732,12 @@ msgstr ""
"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr "Opções Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4740,12 +4750,12 @@ msgstr ""
"Veja o cabeçalho deste script para uma breve documentação das suas opções."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr "Opções de depuração"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4762,7 +4772,7 @@ msgstr ""
"interesse para o utilizador normal, mas algumas podem ter:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4773,7 +4783,7 @@ msgstr ""
"remove, purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4784,7 +4794,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) como um utilizador não root."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4796,7 +4806,7 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4805,12 +4815,12 @@ msgstr ""
"IDs de CD-ROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr "Segue-se uma lista completa de opções de depuração para o apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4818,25 +4828,25 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4845,7 +4855,7 @@ msgstr ""
"criptográficas usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4854,13 +4864,13 @@ msgstr ""
"armazenados em CD-ROMs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Descreve os processos de resolver dependências de compilação no &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4869,7 +4879,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4880,7 +4890,7 @@ msgstr ""
"para um CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -4890,14 +4900,14 @@ msgstr ""
"literal></quote> ao mesmo tempo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Regista no log quando os items são adicionados ou removidos da fila de "
"download global."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4906,7 +4916,7 @@ msgstr ""
"checksums e assinaturas criptográficas dos ficheiros descarregados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4916,7 +4926,7 @@ msgstr ""
"pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4925,7 +4935,7 @@ msgstr ""
"do apt quando se descarrega diffs de índice em vez de índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -4933,7 +4943,7 @@ msgstr ""
"downloads."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -4942,7 +4952,7 @@ msgstr ""
"de pacotes e com a remoção de pacotes não utilizados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4957,7 +4967,7 @@ msgstr ""
"literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -4988,7 +4998,7 @@ msgstr ""
"pacote aparece."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -4998,7 +5008,7 @@ msgstr ""
"único."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5007,7 +5017,7 @@ msgstr ""
"estado e quaisquer erros encontrados enquanto os analisa."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5016,7 +5026,7 @@ msgstr ""
"literal> deve passar os pacotes ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5024,12 +5034,12 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr "Escreve a prioridade da cada lista de pacote no arranque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5038,7 +5048,7 @@ msgstr ""
"acontece quando é encontrado um problema de dependências complexo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5049,7 +5059,7 @@ msgstr ""
"mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5058,13 +5068,13 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5074,7 +5084,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 18a6c3142..2f73e3d49 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2013-04-02 15:13+0300\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1091,14 +1091,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
#, fuzzy
@@ -2975,13 +2975,23 @@ msgid ""
"added to the end of the list (after an implicit \"<literal>none</literal>\")."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:559
+msgid "When downloading, force to use only the IPv4 protocol."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:565
+msgid "When downloading, force to use only the IPv6 protocol."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:572
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:574
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -2993,7 +3003,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:581
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3006,7 +3016,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:590
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3016,7 +3026,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:596
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -3024,7 +3034,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:600
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3035,7 +3045,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:608
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3048,7 +3058,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:621
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -3059,12 +3069,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:618
+#: apt.conf.5.xml:630
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:620
+#: apt.conf.5.xml:632
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3072,7 +3082,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:637
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3085,40 +3095,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:651
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:644
+#: apt.conf.5.xml:656
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:661
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:655
+#: apt.conf.5.xml:667
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:668
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:673
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -3126,7 +3136,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:679
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -3135,7 +3145,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:686
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -3145,7 +3155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:680
+#: apt.conf.5.xml:692
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -3155,26 +3165,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:700
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:705
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:710
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:711
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3189,7 +3199,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:726
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3199,7 +3209,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:708
+#: apt.conf.5.xml:720
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -3213,7 +3223,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:733
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -3226,7 +3236,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:741
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -3243,7 +3253,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:756
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3254,7 +3264,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:763
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3264,7 +3274,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:776
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3276,7 +3286,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:769
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3290,12 +3300,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:789
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:790
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3304,12 +3314,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:798
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:800
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3320,7 +3330,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:811
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3328,7 +3338,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:819
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3336,7 +3346,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:828
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3346,66 +3356,66 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:836
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:846
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:855
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:854
+#: apt.conf.5.xml:866
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:877
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:888
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:899
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:910
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:920
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:930
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:940
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3413,53 +3423,53 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:939
+#: apt.conf.5.xml:951
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:963
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:973
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:983
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:995
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1006
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml:1017
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1027
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -3469,7 +3479,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1029
+#: apt.conf.5.xml:1041
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -3487,46 +3497,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1050
+#: apt.conf.5.xml:1062
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1061
+#: apt.conf.5.xml:1073
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1072
+#: apt.conf.5.xml:1084
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1096
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1107
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1117
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml:1128
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -3534,21 +3544,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1140
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1151
+#: apt.conf.5.xml:1163
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3556,7 +3566,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1175
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 3065526ad..d26b160f9 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -20,6 +20,8 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/gpgv.h>
#include <sys/types.h>
#include <unistd.h>
@@ -598,77 +600,62 @@ SourcesWriter::SourcesWriter(string const &BOverrides,string const &SOverrides,
// ---------------------------------------------------------------------
/* */
bool SourcesWriter::DoPackage(string FileName)
-{
+{
// Open the archive
- FileFd F(FileName,FileFd::ReadOnly);
- if (_error->PendingError() == true)
+ FileFd F;
+ if (OpenMaybeClearSignedFile(FileName, F) == false)
return false;
-
- // Stat the file for later
- struct stat St;
- if (fstat(F.Fd(),&St) != 0)
- return _error->Errno("fstat","Failed to stat %s",FileName.c_str());
- if (St.st_size > 128*1024)
+ unsigned long long const FSize = F.FileSize();
+ //FIXME: do we really need to enforce a maximum size of the dsc file?
+ if (FSize > 128*1024)
return _error->Error("DSC file '%s' is too large!",FileName.c_str());
-
- if (BufSize < (unsigned long long)St.st_size+1)
+
+ if (BufSize < FSize + 2)
{
- BufSize = St.st_size+1;
- Buffer = (char *)realloc(Buffer,St.st_size+1);
+ BufSize = FSize + 2;
+ Buffer = (char *)realloc(Buffer , BufSize);
}
-
- if (F.Read(Buffer,St.st_size) == false)
+
+ if (F.Read(Buffer, FSize) == false)
return false;
+ // Stat the file for later (F might be clearsigned, so not F.FileSize())
+ struct stat St;
+ if (stat(FileName.c_str(), &St) != 0)
+ return _error->Errno("fstat","Failed to stat %s",FileName.c_str());
+
// Hash the file
char *Start = Buffer;
- char *BlkEnd = Buffer + St.st_size;
-
- MD5Summation MD5;
- SHA1Summation SHA1;
- SHA256Summation SHA256;
- SHA256Summation SHA512;
-
- if (DoMD5 == true)
- MD5.Add((unsigned char *)Start,BlkEnd - Start);
- if (DoSHA1 == true)
- SHA1.Add((unsigned char *)Start,BlkEnd - Start);
- if (DoSHA256 == true)
- SHA256.Add((unsigned char *)Start,BlkEnd - Start);
- if (DoSHA512 == true)
- SHA512.Add((unsigned char *)Start,BlkEnd - Start);
+ char *BlkEnd = Buffer + FSize;
- // Add an extra \n to the end, just in case
- *BlkEnd++ = '\n';
-
- /* Remove the PGP trailer. Some .dsc's have this without a blank line
- before */
- const char *Key = "-----BEGIN PGP SIGNATURE-----";
- for (char *MsgEnd = Start; MsgEnd < BlkEnd - strlen(Key) -1; MsgEnd++)
+ Hashes DscHashes;
+ if (FSize == (unsigned long long) St.st_size)
{
- if (*MsgEnd == '\n' && strncmp(MsgEnd+1,Key,strlen(Key)) == 0)
- {
- MsgEnd[1] = '\n';
- break;
- }
+ if (DoMD5 == true)
+ DscHashes.MD5.Add((unsigned char *)Start,BlkEnd - Start);
+ if (DoSHA1 == true)
+ DscHashes.SHA1.Add((unsigned char *)Start,BlkEnd - Start);
+ if (DoSHA256 == true)
+ DscHashes.SHA256.Add((unsigned char *)Start,BlkEnd - Start);
+ if (DoSHA512 == true)
+ DscHashes.SHA512.Add((unsigned char *)Start,BlkEnd - Start);
}
-
- /* Read records until we locate the Source record. This neatly skips the
- GPG header (which is RFC822 formed) without any trouble. */
- pkgTagSection Tags;
- do
+ else
{
- unsigned Pos;
- if (Tags.Scan(Start,BlkEnd - Start) == false)
- return _error->Error("Could not find a record in the DSC '%s'",FileName.c_str());
- if (Tags.Find("Source",Pos) == true)
- break;
- Start += Tags.size();
+ FileFd DscFile(FileName, FileFd::ReadOnly);
+ DscHashes.AddFD(DscFile, St.st_size, DoMD5, DoSHA1, DoSHA256, DoSHA512);
}
- while (1);
+
+ // Add extra \n to the end, just in case (as in clearsigned they are missing)
+ *BlkEnd++ = '\n';
+ *BlkEnd++ = '\n';
+
+ pkgTagSection Tags;
+ if (Tags.Scan(Start,BlkEnd - Start) == false || Tags.Exists("Source") == false)
+ return _error->Error("Could not find a record in the DSC '%s'",FileName.c_str());
Tags.Trim();
-
+
// Lookup the overide information, finding first the best priority.
string BestPrio;
string Bins = Tags.FindS("Binary");
@@ -732,25 +719,25 @@ bool SourcesWriter::DoPackage(string FileName)
string const strippedName = flNotDir(FileName);
std::ostringstream ostreamFiles;
if (DoMD5 == true && Tags.Exists("Files"))
- ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " "
+ ostreamFiles << "\n " << string(DscHashes.MD5.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Files");
string const Files = ostreamFiles.str();
std::ostringstream ostreamSha1;
if (DoSHA1 == true && Tags.Exists("Checksums-Sha1"))
- ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " "
+ ostreamSha1 << "\n " << string(DscHashes.SHA1.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Checksums-Sha1");
string const ChecksumsSha1 = ostreamSha1.str();
std::ostringstream ostreamSha256;
if (DoSHA256 == true && Tags.Exists("Checksums-Sha256"))
- ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " "
+ ostreamSha256 << "\n " << string(DscHashes.SHA256.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Checksums-Sha256");
string const ChecksumsSha256 = ostreamSha256.str();
std::ostringstream ostreamSha512;
if (Tags.Exists("Checksums-Sha512"))
- ostreamSha512 << "\n " << string(SHA512.Result()) << " " << St.st_size << " "
+ ostreamSha512 << "\n " << string(DscHashes.SHA512.Result()) << " " << St.st_size << " "
<< strippedName << "\n " << Tags.FindS("Checksums-Sha512");
string const ChecksumsSha512 = ostreamSha512.str();
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 25ba0d063..3f814b9f0 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -6,6 +6,7 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/indexcopy.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/gpgv.h>
#include <utime.h>
#include <stdio.h>
@@ -70,19 +71,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
if (pid < 0)
return string("Couldn't spawn new process") + strerror(errno);
else if (pid == 0)
- {
- _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);
- }
+ ExecGPGV(outfile, file, 3, fd);
close(fd[1]);
FILE *pipein = fdopen(fd[0], "r");
diff --git a/po/apt-all.pot b/po/apt-all.pot
index fd772e275..8ff4bb5f5 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.9~exp1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1041,7 +1041,8 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1320,7 +1321,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1333,28 +1334,28 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1664,87 +1665,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2065,30 +2066,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2279,17 +2280,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr ""
@@ -2336,6 +2337,12 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr ""
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2730,8 +2737,8 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr ""
@@ -2763,7 +2770,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2771,56 +2778,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, 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:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
@@ -2912,22 +2919,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2942,17 +2949,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ar.po b/po/ar.po
index 7c9ea1d11..f61ab4288 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -1062,7 +1062,8 @@ msgid "%s was already not hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1345,7 +1346,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1358,28 +1359,28 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "تعذر الاتصال بـ%s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1691,87 +1692,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: تعذرت قراءة الدليل %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "فشل فتح %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** فشل ربط %s بـ%s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2095,30 +2096,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "تعذر العثور على التحديد %s"
@@ -2309,17 +2310,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr ""
@@ -2366,6 +2367,12 @@ msgstr "مشكلة في إغلاق الملف"
msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "إجهاض التثبيت."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2761,8 +2768,8 @@ msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
@@ -2795,7 +2802,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2803,56 +2810,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, 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:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
@@ -2947,22 +2954,22 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2977,17 +2984,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "إجهاض التثبيت."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ast.po b/po/ast.po
index 908155a66..dfdf26fdf 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -1189,7 +1189,8 @@ msgid "%s was already not hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -1472,7 +1473,7 @@ msgstr "Fallu temporal al resolver '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1485,29 +1486,29 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nun pudo coneutase a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Atopóse polo menos una robla mala."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Fallu desconocíu al executar gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Les siguientes robles nun valieron:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1880,87 +1881,87 @@ msgstr "L'archivu nun tien rexistru de control"
msgid "Unable to get a cursor"
msgstr "Nun pudo algamase un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nun pudo lleese'l direutoriu %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nun pudo lleese %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al ficheru "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nun pudo resolvese %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falló'l percorríu pol árbol"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nun pudo abrise %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Desenllazar %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nun pudo lleese l'enllaz %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nun pudo desenllazase %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falló enllazar enllazr %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -2309,30 +2310,30 @@ msgstr ""
"desactivao pol usuariu."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Escoyeta %s que nun s'atopa"
@@ -2526,17 +2527,17 @@ msgstr "El subprocesu %s recibió un fallu de segmentación."
msgid "Sub-process %s received signal %u."
msgstr "El subprocesu %s recibió una señal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subprocesu %s devolvió un códigu d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subprocesu %s terminó de manera inesperada"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nun se pudo abrir el ficheru %s"
@@ -2583,6 +2584,12 @@ msgstr "Hai problemes desvenceyando'l ficheru %s"
msgid "Problem syncing the file"
msgstr "Hai problemes al sincronizar el ficheru"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "L'aniellu de claves nun s'instaló en %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes balera."
@@ -2995,8 +3002,8 @@ msgstr "falló'l cambiu de nome, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 nun concasa"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
@@ -3028,7 +3035,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3038,12 +3045,12 @@ msgstr ""
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,7 +3059,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3068,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3069,31 +3076,31 @@ msgstr ""
"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
"paquete %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "El tamañu nun concasa"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ensin seiciones nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ensin entrada Hash nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
@@ -3193,22 +3200,22 @@ msgstr "Escribiendo llista nueva d'oríxenes\n"
msgid "Source list entries for this disc are:\n"
msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rexistros escritos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rexistros escritos con %i ficheros de menos.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3225,17 +3232,6 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
msgid "Hash mismatch for: %s"
msgstr "El hash nun concasa pa: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "L'aniellu de claves nun s'instaló en %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/bg.po b/po/bg.po
index f43ae7530..f302170a3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -1202,7 +1202,8 @@ msgid "%s was already not hold.\n"
msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -1506,7 +1507,7 @@ msgstr "Временен неуспех при намирането на IP ад
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
#: methods/connect.cc:211
@@ -1519,32 +1520,32 @@ msgstr "Нещо лошо се случи при намирането на IP а
msgid "Unable to connect to %s:%s:"
msgstr "Неуспех при свързване с %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
"ключа?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Намерен е поне един невалиден подпис."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
"gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Неизвестна грешка при изпълнението на gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Следните подписи са невалидни:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1919,87 +1920,87 @@ msgstr "В архива няма поле „control“"
msgid "Unable to get a cursor"
msgstr "Неуспех при получаването на курсор"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Неуспех при четенето на директория %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Неуспех при четенето на %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Грешките се отнасят за файла "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Неуспех при превръщането на %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Неуспех при обхода на дървото"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Неуспех при отварянето на %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Неуспех при прочитането на връзка %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Неуспех при премахването на връзка %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Неуспех при създаването на връзка %s към %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "Превишен лимит на DeLink от %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -2347,30 +2348,30 @@ msgstr ""
"забранено от потребителя."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liч %liм %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liч %liм %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liм %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
@@ -2567,17 +2568,17 @@ msgstr "Нарушение на защитата на паметта (segmentati
msgid "Sub-process %s received signal %u."
msgstr "Под-процесът %s получи сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Подпроцесът %s върна код за грешка (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Подпроцесът %s завърши неочаквано"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Неуспех при отварянето на файла %s"
@@ -2625,6 +2626,12 @@ msgstr "Проблем при изтриване на файла %s"
msgid "Problem syncing the file"
msgstr "Проблем при синхронизиране на файла"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "В %s няма инсталиран ключодържател."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Празен кеш на пакети"
@@ -3049,8 +3056,8 @@ msgstr "преименуването се провали, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Несъответствие на контролната сума"
@@ -3086,7 +3093,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3096,12 +3103,12 @@ msgstr ""
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3110,7 +3117,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3119,38 +3126,38 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Несъответствие на размера"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неуспех при анализиране на файл Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Във файла Release %s липсват раздели"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Във файла Release %s липсва контролна сума"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправилна стойност за „Date“ във файла Release %s"
@@ -3250,22 +3257,22 @@ msgstr "Запазване на новия списък с източници\n"
msgid "Source list entries for this disc are:\n"
msgstr "Записите в списъка с източници за този диск са:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записани са %i записа.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записани са %i записа с %i липсващи файла.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записани са %i записа с %i несъответстващи файла\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
@@ -3280,17 +3287,6 @@ msgstr "Не е намерен oторизационен запис за: %s"
msgid "Hash mismatch for: %s"
msgstr "Несъответствие на контролната сума за: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "В %s няма инсталиран ключодържател."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3534,6 +3530,9 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускане на несъществуващ файл %s"
diff --git a/po/bs.po b/po/bs.po
index bce21d794..2e2dd1192 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -1060,7 +1060,8 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1355,29 +1356,29 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1688,87 +1689,87 @@ msgstr "Arhiva nema kontrolnog zapisa"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Ne mogu otvoriti %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2092,30 +2093,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2306,17 +2307,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr ""
@@ -2363,6 +2364,12 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2759,8 +2766,8 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr ""
@@ -2792,7 +2799,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2800,56 +2807,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, 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:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
@@ -2944,22 +2951,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2974,17 +2981,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ca.po b/po/ca.po
index 64af4e6f4..b99734771 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1210,7 +1210,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -1494,7 +1495,7 @@ msgstr "S'ha produït un error temporal en resoldre «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1507,32 +1508,32 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "No es pot connectar amb %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"No s'ha pogut executar el «gpgv» per a verificar la signatura (està "
"instaŀlat el gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "S'ha produït un error desconegut en executar el gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Les signatures següents són invàlides:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1905,87 +1906,87 @@ msgstr "Arxiu sense registre de control"
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No es pot llegir el directori %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No es pot veure l'estat %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Els errors s'apliquen al fitxer "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "No s'ha pogut resoldre %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "L'arbre està fallant"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "No s'ha pogut obrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "No s'ha pogut llegir l'enllaç %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "No s'ha pogut alliberar %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No s'ha pogut enllaçar %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -2333,30 +2334,30 @@ msgstr ""
"està deshabilitat per l'usuari."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -2554,17 +2555,17 @@ msgstr "El sub-procés %s ha rebut una violació de segment."
msgid "Sub-process %s received signal %u."
msgstr "El sub-procés %s ha rebut un senyal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El sub-procés %s ha sortit inesperadament"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "No s'ha pogut obrir el fitxer %s"
@@ -2611,6 +2612,12 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No s'ha instaŀlat cap clauer a %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Memòria cau de paquets és buida"
@@ -3032,8 +3039,8 @@ msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 no concorda"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
@@ -3069,7 +3076,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3080,12 +3087,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3095,7 +3102,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3104,7 +3111,7 @@ msgstr ""
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3112,31 +3119,31 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "La mida no concorda"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No es pot analitzar el fitxer Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "No hi ha seccions al fitxer Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No hi ha una entrada Hash al fitxer Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "El camp «Date» al fitxer Release %s és invàlid"
@@ -3236,22 +3243,22 @@ msgstr "S'està escrivint una nova llista de fonts\n"
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:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "S'han escrit %i registres.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3268,17 +3275,6 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
msgid "Hash mismatch for: %s"
msgstr "El resum no coincideix per a: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "El fitxer %s no comença amb un missatge signat en clar"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaŀlat cap clauer a %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3519,6 +3515,9 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "El fitxer %s no comença amb un missatge signat en clar"
+
#~ msgid "decompressor"
#~ msgstr "decompressor"
diff --git a/po/cs.po b/po/cs.po
index df8f64b31..5c17539b8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1185,7 +1185,8 @@ msgid "%s was already not hold.\n"
msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -1486,7 +1487,7 @@ msgstr "Dočasné selhání při zjišťování „%s“"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
#: methods/connect.cc:211
@@ -1499,28 +1500,28 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i -
msgid "Unable to connect to %s:%s:"
msgstr "Nelze se připojit k %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Neznámá chyba při spouštění gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1885,87 +1886,87 @@ msgstr "Archiv nemá kontrolní záznam"
msgid "Unable to get a cursor"
msgstr "Nelze získat kurzor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nelze číst adresář %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nelze vyhodnotit %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Chyby se týkají souboru "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba při zjišťování %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Průchod stromem selhal"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nelze otevřít %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Odlinkování %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nelze přečíst link %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nelze odlinkovat %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nezdařilo se slinkovat %s s %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -2310,30 +2311,30 @@ msgstr ""
"zakázáno."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2527,17 +2528,17 @@ msgstr "Podproces %s obdržel chybu segmentace."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s obdržel signál %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočekávaně skončil"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nelze otevřít soubor %s"
@@ -2584,6 +2585,12 @@ msgstr "Problém při odstraňování souboru %s"
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s není nainstalována žádná klíčenka."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache balíků je prázdná"
@@ -2990,8 +2997,8 @@ msgstr "přejmenování selhalo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních součtů"
@@ -3027,7 +3034,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3037,12 +3044,12 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3051,7 +3058,7 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento "
"balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3060,38 +3067,38 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nelze zpracovat Release soubor %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Release soubor %s neobsahuje žádné sekce"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release soubor %s neobsahuje Hash záznam"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neplatná položka „Date“ v Release souboru %s"
@@ -3191,22 +3198,22 @@ msgstr "Zapisuji nový seznam balíků\n"
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapsáno %i záznamů.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3221,17 +3228,6 @@ msgstr "Nelze najít autentizační záznam pro: %s"
msgid "Hash mismatch for: %s"
msgstr "Neshoda kontrolních součtů pro: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Soubor %s nezačíná podpisem"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s není nainstalována žádná klíčenka."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3459,6 +3455,9 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Soubor %s nezačíná podpisem"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Přeskakuji neexistující soubor %s"
diff --git a/po/cy.po b/po/cy.po
index 3e684a489..82abc9ae7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -1208,7 +1208,8 @@ msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -1499,7 +1500,7 @@ msgstr "Methiant dros dro yn datrys '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1512,29 +1513,29 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1908,88 +1909,88 @@ msgstr "Does dim cofnod rheoli gan yr archif"
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -2344,30 +2345,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
@@ -2563,17 +2564,17 @@ msgstr "Derbyniodd is-broses %s wall segmentu."
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
@@ -2622,6 +2623,12 @@ msgstr "Gwall wrth dadgysylltu'r ffeil"
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
@@ -3051,8 +3058,8 @@ msgstr "methwyd ailenwi, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
@@ -3086,7 +3093,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3094,13 +3101,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,7 +3116,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,40 +3125,40 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
@@ -3247,22 +3254,22 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3277,17 +3284,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/da.po b/po/da.po
index 4ca0c0711..9f98df6a7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-03 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1191,7 +1191,8 @@ msgid "%s was already not hold.\n"
msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -1494,7 +1495,7 @@ msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1507,30 +1508,30 @@ msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kunne ikke forbinde til %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Stødte på mindst én ugyldig signatur."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Ukendt fejl ved kørsel af gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Følgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1902,87 +1903,87 @@ msgstr "Arkivet har ingen kontrolindgang"
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markør"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Kunne ikke læse mappen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kunne ikke finde %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Fejlene vedrører filen "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Kunne ikke omsætte navnet %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Trævandring mislykkedes"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Kunne ikke åbne %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Kunne ikke »readlink« %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Kunne ikke frigøre %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Kunne ikke lænke %s til %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2333,30 +2334,30 @@ msgstr ""
"bruger."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2547,17 +2548,17 @@ msgstr "Underprocessen %s modtog en segmenteringsfejl."
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s modtog en signal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerede en fejlkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s afsluttedes uventet"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke åbne filen %s"
@@ -2604,6 +2605,12 @@ msgstr "Fejl ved frigivelse af filen %s"
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøglering installeret i %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakke-mellemlager"
@@ -3014,8 +3021,8 @@ msgstr "omdøbning mislykkedes, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hashsum stemmer ikke"
@@ -3052,7 +3059,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3062,12 +3069,12 @@ msgstr ""
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3076,7 +3083,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,37 +3092,37 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunne ikke fortolke udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen afsnit i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Intet hashpunkt i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
@@ -3215,22 +3222,22 @@ msgstr "Skriver ny kildeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har følgende kildeliste-indgange:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i ikke-trufne filer\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3245,17 +3252,6 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsum stemmer ikke: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Fil %s starter ikke med en »clearsigned« besked"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøglering installeret i %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3483,6 +3479,9 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Fil %s starter ikke med en »clearsigned« besked"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Springer ikkeeksisterende fil over %s"
diff --git a/po/de.po b/po/de.po
index 604696146..ac0ca11bb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -1230,7 +1230,8 @@ msgid "%s was already not hold.\n"
msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1540,7 +1541,7 @@ msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
#: methods/connect.cc:211
@@ -1553,32 +1554,32 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
msgid "Unable to connect to %s:%s:"
msgstr "Verbindung mit %s:%s nicht möglich:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Unbekannter Fehler beim Ausführen von gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden Signaturen waren ungültig:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1964,87 +1965,87 @@ msgstr "Archiv hat keinen Steuerungsdatensatz."
msgid "Unable to get a cursor"
msgstr "Unmöglich, einen Cursor zu bekommen"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Fehler gehören zu Datei "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s konnte nicht aufgelöst werden."
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Öffnen von %s fehlgeschlagen"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink von %s fehlgeschlagen"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Entfernen (unlink) von %s fehlgeschlagen"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archiv hatte kein Feld »package«"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s.\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -2394,30 +2395,30 @@ msgstr ""
"MMap vom Benutzer deaktiviert ist."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li d %li h %li min %li s"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li h %li min %li s"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li min %li s"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2616,17 +2617,17 @@ msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
msgid "Sub-process %s received signal %u."
msgstr "Unterprozess %s hat das Signal %u empfangen."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s unerwartet beendet"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Datei %s konnte nicht geöffnet werden."
@@ -2677,6 +2678,12 @@ msgstr "Problem beim Entfernen (unlink) der Datei %s"
msgid "Problem syncing the file"
msgstr "Problem beim Synchronisieren der Datei"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Kein Schlüsselring in %s installiert"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Leerer Paketzwischenspeicher"
@@ -3105,8 +3112,8 @@ msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
@@ -3143,7 +3150,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3154,12 +3161,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3169,7 +3176,7 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3178,38 +3185,38 @@ msgstr ""
"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
"Sie dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release-Datei %s kann nicht verarbeitet werden."
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Kein Hash-Eintrag in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
@@ -3309,22 +3316,22 @@ msgstr "Schreiben der neuen Quellliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für dieses Medium sind:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Es wurden %i Datensätze geschrieben.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3341,17 +3348,6 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-Summe stimmt nicht überein für: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3596,6 +3592,9 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Nicht vorhandene Datei %s wird übersprungen."
diff --git a/po/dz.po b/po/dz.po
index dd9947476..ac74061df 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -1176,7 +1176,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -1460,7 +1461,7 @@ msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
#: methods/connect.cc:211
@@ -1473,32 +1474,32 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
msgid "Unable to connect to %s:%s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
"མ་ཚུགས?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1870,87 +1871,87 @@ msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་
msgid "Unable to get a cursor"
msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "ཨི:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "ཌབ་ལུ:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -2297,30 +2298,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -2512,17 +2513,17 @@ msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བག
msgid "Sub-process %s received signal %u."
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2569,6 +2570,12 @@ msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེད
msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
@@ -2978,8 +2985,8 @@ msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འ
msgid "MD5Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
@@ -3012,7 +3019,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3020,12 +3027,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,7 +3041,7 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3043,38 +3050,38 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "ཚད་མ་མཐུན།"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
@@ -3171,22 +3178,22 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས
msgid "Source list entries for this disc are:\n"
msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3203,17 +3210,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/el.po b/po/el.po
index f6252ed32..8dea2d551 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1197,7 +1197,8 @@ msgid "%s was already not hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -1480,7 +1481,7 @@ msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1493,33 +1494,33 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
msgid "Unable to connect to %s:%s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
"αποτυπώματος?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
"εγκατεστημένο το gpgv;)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1893,87 +1894,87 @@ msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχο
msgid "Unable to get a cursor"
msgstr "Αδύνατη η πρόσβαση σε δείκτη"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Σφάλματα στο αρχείο"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Αδύνατη η εύρεση του %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Αποτυχία ανεύρεσης"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Αποτυχία ανοίγματος του %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Αποσύνδεση %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Αποτυχία ανάγνωσης του %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Αποτυχία αποσύνδεσης του %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr " Αποτυχία σύνδεσης του %s με το %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -2320,30 +2321,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2540,17 +2541,17 @@ msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμ
msgid "Sub-process %s received signal %u."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
@@ -2597,6 +2598,12 @@ msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Εγκατάλειψη της εγκατάστασης."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Άδειο cache πακέτων"
@@ -3012,8 +3019,8 @@ msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
@@ -3045,7 +3052,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3053,12 +3060,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3067,7 +3074,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3076,7 +3083,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3084,31 +3091,31 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
@@ -3206,22 +3213,22 @@ msgstr "Eγγραφή νέας λίστας πηγών\n"
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Εγιναν %i εγγραφές.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
@@ -3236,17 +3243,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Εγκατάλειψη της εγκατάστασης."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/es.po b/po/es.po
index 56019b62d..8209ac977 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1262,7 +1262,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -1545,7 +1546,7 @@ msgstr "Fallo temporal al resolver «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1558,31 +1559,31 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "No se pudo conectar a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Se encontró al menos una firma inválida."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Error desconocido ejecutando gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Las siguientes firms fueron inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1960,87 +1961,87 @@ msgstr "No hay registro de control del archivo"
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No se pudo leer directorio %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No se pudo leer %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al archivo "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "No se pudo resolver %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falló el recorrido por el árbol."
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "No se pudo abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "No se pudo leer el enlace %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "No se pudo desligar %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No pude enlazar %s con %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al límite de %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -2391,30 +2392,30 @@ msgstr ""
"deshabilitado el crecimiento automático."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin. %liseg."
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin. %liseg."
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin. %liseg."
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liseg."
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selección %s no encontrada"
@@ -2611,17 +2612,17 @@ msgstr "El subproceso %s recibió un fallo de segmentación."
msgid "Sub-process %s received signal %u."
msgstr "El subproceso %s recibió la señal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subproceso %s devolvió un código de error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subproceso %s terminó de forma inesperada"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "No pude abrir el fichero %s"
@@ -2668,6 +2669,12 @@ msgstr "Se produjo un problema al desligar el fichero %s"
msgid "Problem syncing the file"
msgstr "Se produjo un problema al sincronizar el fichero"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No se instaló ningún anillo de claves %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes vacía."
@@ -3092,8 +3099,8 @@ msgstr "falló el cambio de nombre, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
@@ -3127,7 +3134,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3138,12 +3145,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3153,7 +3160,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3162,7 +3169,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3170,31 +3177,31 @@ msgstr ""
"Los archivos de índice de paquetes están dañados. No existe un campo "
"«Filename:» para el paquete %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "El tamaño difiere"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "No se encontraron secciones en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada «Date» inválida en el archivo «Release» %s"
@@ -3294,22 +3301,22 @@ msgstr "Escribiendo nueva lista de fuente\n"
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:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i registros escritos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, 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:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, 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:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3325,17 +3332,6 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "La suma hash difiere para: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No se instaló ningún anillo de claves %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/eu.po b/po/eu.po
index 4809d7232..993e427cd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -1180,7 +1180,8 @@ msgid "%s was already not hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -1468,7 +1469,7 @@ msgstr "Aldi baterako akatsa '%s' ebaztean"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
#: methods/connect.cc:211
@@ -1481,29 +1482,29 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
msgid "Unable to connect to %s:%s:"
msgstr "Ezin da konektatu -> %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Beintza sinadura baliogabe bat aurkitu da."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, 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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Errore ezezaguna gpgv exekutatzean"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Ondorengo sinadurak baliogabeak dira:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1869,87 +1870,87 @@ msgstr "Artxiboak ez du kontrol erregistrorik"
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Ezin da %s direktorioa irakurri\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Ezin da %s atzitu\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Erroreak fitxategiari dagozkio "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Huts egin du %s ebaztean"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Huts egin dute zuhaitz-urratsek"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Huts egin du %s irekitzean"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Huts egin du %s esteka irakurtzean"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Huts egin du %s desestekatzean"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -2296,30 +2297,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
@@ -2514,17 +2515,17 @@ msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
msgid "Sub-process %s received signal %u."
msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s azpiprozesua ustekabean amaitu da"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s fitxategia ezin izan da ireki"
@@ -2571,6 +2572,12 @@ msgstr "Arazoa fitxategia desestekatzean"
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Paketeen katxea hutsik"
@@ -2976,8 +2983,8 @@ msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
@@ -3009,7 +3016,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3017,12 +3024,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3031,7 +3038,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3040,7 +3047,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3048,31 +3055,31 @@ msgstr ""
"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
@@ -3170,22 +3177,22 @@ msgstr "Jatorri zerrenda berria idazten\n"
msgid "Source list entries for this disc are:\n"
msgstr "Diskoarentzako jatorri sarrerak:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i erregistro grabaturik.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3201,17 +3208,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortatu instalazioa."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/fi.po b/po/fi.po
index 53d63dbd0..4c29cf2ca 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1175,7 +1175,8 @@ msgid "%s was already not hold.\n"
msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -1458,7 +1459,7 @@ msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
#: methods/connect.cc:211
@@ -1471,31 +1472,31 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, 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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1866,87 +1867,87 @@ msgstr "Arkistolla ei ole ohjaustietuetta"
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kansiota %s ei voi lukea\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Tdstolle %s ei toimi stat\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Tiedostossa virheitä "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Osoitteen %s selvitys ei onnistunut"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Puun läpikäynti ei onnistunut"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ei onnistunut"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ei onnistunut"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -2292,30 +2293,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -2506,17 +2507,17 @@ msgstr "Aliprosessi %s aiheutti suojausvirheen."
msgid "Sub-process %s received signal %u."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Aliprosessi %s lopetti odottamatta"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Tiedostoa %s ei voitu avata"
@@ -2563,6 +2564,12 @@ msgstr "Pulmia tehtäessä tiedostolle unlink"
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetään."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Pakettivarasto on tyhjä"
@@ -2968,8 +2975,8 @@ msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Tarkistussumma ei täsmää"
@@ -3001,7 +3008,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3009,12 +3016,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3023,7 +3030,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3032,7 +3039,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3040,31 +3047,31 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Koko ei täsmää"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Virheellinen rivi korvautustiedostossa: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
@@ -3162,22 +3169,22 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n"
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Kirjoitettiin %i tietuetta.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3194,17 +3201,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Kohteen %s tarkistussumma ei täsmää"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Asennus keskeytetään."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/fr.po b/po/fr.po
index 129d70ba0..97ff54fc2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2013-03-24 08:57+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1229,7 +1229,8 @@ msgid "%s was already not hold.\n"
msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -1539,8 +1540,8 @@ msgid "Temporary failure resolving '%s'"
msgstr "Erreur temporaire de résolution de « %s »"
#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
msgstr "Erreur système lors de la résolution de « %s:%s » (%s)"
#: methods/connect.cc:211
@@ -1555,32 +1556,32 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Impossible de se connecter à %s:%s :"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Au moins une signature non valable a été rencontrée."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Erreur inconnue à l'exécution de gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Les signatures suivantes ne sont pas valables :\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1956,87 +1957,87 @@ msgstr "L'archive n'a pas d'enregistrement de contrôle"
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A : Impossible de lire le contenu du répertoire %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A : Impossible de statuer %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E : "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A : "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E : des erreurs sont survenues sur le fichier "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Impossible de résoudre %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Échec du parcours de l'arbre"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Impossible d'ouvrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Délier %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Impossible de lire le lien %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Impossible de délier %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Impossible de lier %s à %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ne possède pas d'entrée « source override »\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ne possède pas également pas d'entrée « binary override »\n"
@@ -2390,30 +2391,30 @@ msgstr ""
"automatique a été désactivée par une option utilisateur."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "La sélection %s n'a pu être trouvée"
@@ -2616,17 +2617,17 @@ msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
msgid "Sub-process %s received signal %u."
msgstr "Le sous-processus %s a reçu le signal %u"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Le sous-processus %s s'est arrêté prématurément"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Impossible d'ouvrir le fichier %s"
@@ -2673,6 +2674,12 @@ msgstr "Problème de suppression du lien %s"
msgid "Problem syncing the file"
msgstr "Problème de synchronisation du fichier"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache des paquets vide"
@@ -3113,8 +3120,8 @@ msgstr "impossible de changer le nom, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Somme de contrôle MD5 incohérente"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Somme de contrôle de hachage incohérente"
@@ -3152,7 +3159,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3163,12 +3170,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3177,7 +3184,7 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3186,7 +3193,7 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3194,31 +3201,31 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Taille incohérente"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossible d'analyser le fichier Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Pas de sections dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrée « Date » non valable dans le fichier Release %s"
@@ -3318,22 +3325,22 @@ msgstr "Écriture de la nouvelle liste de sources\n"
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:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i enregistrements écrits.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3350,17 +3357,6 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
msgid "Hash mismatch for: %s"
msgstr "Somme de contrôle de hachage incohérente pour %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Le fichier %s ne commence pas par un message signé en clair."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clés installé dans %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3603,6 +3599,9 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Le fichier %s ne commence pas par un message signé en clair."
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Fichier %s inexistant ignoré"
diff --git a/po/gl.po b/po/gl.po
index 9bf5a9db1..821227308 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -1207,7 +1207,8 @@ msgid "%s was already not hold.\n"
msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -1491,7 +1492,7 @@ msgstr "Produciuse un fallo temporal ao buscar «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1504,32 +1505,32 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Non é posíbel conectar %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada "
"dixital da chave"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Atopouse polo menos unha sinatura incorrecta."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado "
"gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Produciuse un erro descoñecido ao executar gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "As seguintes sinaturas non eran correctas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1904,87 +1905,87 @@ msgstr "O arquivo non ten un rexistro de control"
msgid "Unable to get a cursor"
msgstr "Non é posíbel obter un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: non é posíbel ler o directorio %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: non é posíbel atopar %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: os erros aplícanse ao ficheiro "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Non foi posíbel solucionar %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Fallou o percorrido da árbore"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Non foi posíbel abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DesLig %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Non foi posíbel ler a ligazón %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Non foi posíbel desligar %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Non foi posíbel ligar %s con %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Acadouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de «override»\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ten unha entrada de «override» de código fonte\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de «override» de binarios\n"
@@ -2335,30 +2336,30 @@ msgstr ""
"desactivado polo usuario."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
@@ -2557,17 +2558,17 @@ msgstr "O subproceso %s recibiu un fallo de segmento."
msgid "Sub-process %s received signal %u."
msgstr "O subproceso %s recibiu o sinal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O subproceso %s devolveu un código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O subproceso %s saíu de xeito inesperado"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Non foi posíbel abrir o ficheiro %s"
@@ -2614,6 +2615,12 @@ msgstr "Produciuse un problema ao desligar o ficheiro %s"
msgid "Problem syncing the file"
msgstr "Produciuse un problema ao sincronizar o ficheiro"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Non ha ningún chaveiro instalado en %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes baleira"
@@ -3032,8 +3039,8 @@ msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "A MD5Sum non coincide"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "A sumas «hash» non coinciden"
@@ -3068,7 +3075,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3079,12 +3086,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3093,7 +3100,7 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3102,7 +3109,7 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3110,31 +3117,31 @@ msgstr ""
"Os ficheiros de índices de paquetes están danados. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Non se puido analizar o ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Non hai seccións no ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
@@ -3234,22 +3241,22 @@ msgstr "Escribindo a nova lista de orixes\n"
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de orixes deste disco son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escribíronse %i rexistros.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3266,17 +3273,6 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "Valor de hash non coincidente para: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Non ha ningún chaveiro instalado en %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/hu.po b/po/hu.po
index 325d396cd..34ddd7609 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -1195,7 +1195,8 @@ msgid "%s was already not hold.\n"
msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Nem található a(z) %s, a várakozás után sem"
@@ -1502,7 +1503,7 @@ msgstr "Átmeneti hiba „%s” feloldása közben"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
#: methods/connect.cc:211
@@ -1515,29 +1516,29 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Legalább egy aláírás érvénytelen."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Ismeretlen gpgv futtatási hiba"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1908,87 +1909,87 @@ msgstr "Az archívumnak nincs vezérlő rekordja"
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "F: %s nem érhető el\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "H: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "F: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "H: Hibás a fájl "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nem sikerült feloldani ezt: %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Fabejárás nem sikerült"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s megnyitása sikertelen"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink nem hajtható végre erre: %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s törlése sikertelen"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s linkelése sikertelen ehhez: %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " a DeLink korlátja (%sB) elérve.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
@@ -2337,30 +2338,30 @@ msgstr ""
"automatikus emelést."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lin %lió %lip %limp"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lió %lip %limp"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%lip %limp"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%limp"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
@@ -2559,17 +2560,17 @@ msgstr "%s alfolyamat szegmentálási hibát okozott."
msgid "Sub-process %s received signal %u."
msgstr "A(z) %s alfolyamat %u számú szignált kapott."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s alfolyamat váratlanul kilépett"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nem lehet megnyitni a(z) %s fájlt"
@@ -2616,6 +2617,12 @@ msgstr "Hiba a(z) %s fájl törlésekor"
msgid "Problem syncing the file"
msgstr "Hiba a fájl szinkronizálásakor"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nincs kulcstartó telepítve ide: %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Üres csomaggyorsítótár"
@@ -3039,8 +3046,8 @@ msgstr "sikertelen átnevezés, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
@@ -3076,7 +3083,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3086,12 +3093,12 @@ msgstr ""
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,7 +3107,7 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,38 +3116,38 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "A(z) %s Release fájl nem dolgozható fel"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
@@ -3240,22 +3247,22 @@ msgstr "Új forráslista írása\n"
msgid "Source list entries for this disc are:\n"
msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rekord kiírva.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rekord kiírva %i eltérő fájllal\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n"
@@ -3270,17 +3277,6 @@ msgstr "%s hitelesítési rekordja nem található"
msgid "Hash mismatch for: %s"
msgstr "%s ellenőrzőösszege nem megfelelő"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nincs kulcstartó telepítve ide: %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3515,6 +3511,9 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "A nem létező %s fájl kihagyása"
diff --git a/po/it.po b/po/it.po
index 8258eaa4c..c8a1b87c6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-25 21:54+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1215,7 +1215,8 @@ msgid "%s was already not hold.\n"
msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -1521,7 +1522,7 @@ msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
@@ -1536,32 +1537,32 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Impossibile connettersi a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "È stata trovata almeno una firma non valida."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Le seguenti firme non erano valide:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1938,87 +1939,87 @@ msgstr "Impossibile ottenere un cursore"
# (ndt) messo A per Avviso
# Inizio con la maiuscola dopo i : perché mi sa che in molti
# casi molte stringhe sono così
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Impossibile leggere la directory %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Impossibile eseguire stat su %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Gli errori si applicano al file "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Risoluzione di %s non riuscita"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Visita dell'albero non riuscita"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Apertura di %s non riuscita"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Delink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Esecuzione di readlink su %s non riuscita"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Esecuzione di unlink su %s non riuscita"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Collegamento di %s a %s non riuscito"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Raggiunto il limite di DeLink di %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -2368,30 +2369,30 @@ msgstr ""
"ridimensionamento automatico è stato disabilitato dall'utente."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lig %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
@@ -2595,17 +2596,17 @@ msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Il sottoprocesso %s è uscito inaspettatamente"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Impossibile aprire il file %s"
@@ -2652,6 +2653,12 @@ msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
msgid "Problem syncing the file"
msgstr "Si è verificato un problema nel sincronizzare il file"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nessun portachiavi installato in %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache dei pacchetti vuota"
@@ -3084,8 +3091,8 @@ msgstr "rename() non riuscita: %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5sum non corrispondente"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
@@ -3122,7 +3129,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3132,12 +3139,12 @@ msgstr ""
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3146,7 +3153,7 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3156,7 +3163,7 @@ msgstr ""
"correggere manualmente questo pacchetto."
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3164,31 +3171,31 @@ msgstr ""
"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
"per il pacchetto %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossibile analizzare il file Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Nessuna sezione nel file Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nessuna voce Hash nel file Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Voce \"Date\" nel file Release %s non valida"
@@ -3288,22 +3295,22 @@ msgstr "Scrittura nuovo elenco sorgenti\n"
msgid "Source list entries for this disc are:\n"
msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Scritti %i record.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Scritti %i record con %i file mancanti.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Scritti %i record con %i file senza corrispondenze\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3319,17 +3326,6 @@ msgstr "Impossibile trovare il record di autenticazione per %s"
msgid "Hash mismatch for: %s"
msgstr "Hash non corrispondente per %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, 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:403
#, c-format
@@ -3576,6 +3572,9 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Saltato il file inesistente %s"
diff --git a/po/ja.po b/po/ja.po
index 708611629..a88723134 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-01 00:14+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1198,7 +1198,8 @@ msgid "%s was already not hold.\n"
msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -1500,7 +1501,7 @@ msgstr "'%s' が一時的に解決できません"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
#: methods/connect.cc:211
@@ -1513,30 +1514,30 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s へ接続できません:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "少なくとも 1 つの不正な署名が発見されました。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ"
"ていますか?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv の実行中に未知のエラーが発生"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "以下の署名が無効です:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1902,87 +1903,87 @@ msgstr "アーカイブにコントロールレコードがありません"
msgid "Unable to get a cursor"
msgstr "カーソルを取得できません"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告: ディレクトリ %s が読めません\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告: %s の状態を取得できません\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "エラー: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "エラー: エラーが適用されるファイルは "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s の解決に失敗しました"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "ツリー内での移動に失敗しました"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s のオープンに失敗しました"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " リンク %s [%s] を外します\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s のリンク読み取りに失敗しました"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s のリンク解除に失敗しました"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s を %s にリンクするのに失敗しました"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " リンクを外す制限の %sB に到達しました。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -2329,30 +2330,30 @@ msgstr ""
"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li日 %li時間 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li時間 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
@@ -2548,17 +2549,17 @@ msgstr "子プロセス %s がセグメンテーション違反を受け取り
msgid "Sub-process %s received signal %u."
msgstr "子プロセス %s がシグナル %u を受け取りました。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子プロセス %s がエラーコード (%u) を返しました"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子プロセス %s が予期せず終了しました"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "ファイル %s をオープンできませんでした"
@@ -2605,6 +2606,12 @@ msgstr "ファイル %s の削除中に問題が発生しました"
msgid "Problem syncing the file"
msgstr "ファイルの同期中に問題が発生しました"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s にキーリングがインストールされていません。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "空のパッケージキャッシュ"
@@ -3024,8 +3031,8 @@ msgstr "名前の変更に失敗しました。%s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "ハッシュサムが適合しません"
@@ -3063,7 +3070,7 @@ msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3073,12 +3080,12 @@ msgstr ""
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3087,7 +3094,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3096,7 +3103,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3104,31 +3111,31 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "サイズが適合しません"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release ファイル %s を解釈することができません"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Release ファイル %s にセクションがありません"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release ファイル %s に Hash エントリがありません"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
@@ -3228,22 +3235,22 @@ msgstr "新しいソースリストを書き込んでいます\n"
msgid "Source list entries for this disc are:\n"
msgstr "このディスクのソースリストのエントリ:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i レコードを書き込みました。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3260,17 +3267,6 @@ msgstr "認証レコードが見つかりません: %s"
msgid "Hash mismatch for: %s"
msgstr "ハッシュサムが適合しません: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s にキーリングがインストールされていません。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3507,5 +3503,8 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "存在しないファイル %s をスキップしています"
diff --git a/po/km.po b/po/km.po
index aea6d34cb..6e938ff07 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -1160,7 +1160,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -1442,7 +1443,7 @@ msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1455,29 +1456,29 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
msgid "Unable to connect to %s:%s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1841,87 +1842,87 @@ msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រ
msgid "Unable to get a cursor"
msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "មែក​ធាង បាន​បរាជ័យ"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -2266,30 +2267,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -2480,17 +2481,17 @@ msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​ក
msgid "Sub-process %s received signal %u."
msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
@@ -2537,6 +2538,12 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
@@ -2941,8 +2948,8 @@ msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (
msgid "MD5Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
@@ -2975,7 +2982,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2983,12 +2990,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2997,7 +3004,7 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3005,37 +3012,37 @@ msgid ""
msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
@@ -3132,22 +3139,22 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ
msgid "Source list entries for this disc are:\n"
msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
@@ -3162,17 +3169,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ko.po b/po/ko.po
index ba7f6bef7..9d84ac236 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1177,7 +1177,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -1460,7 +1461,7 @@ msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
#: methods/connect.cc:211
@@ -1473,29 +1474,29 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s에 연결할 수 없습니다:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "다음 서명이 올바르지 않습니다:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1862,88 +1863,88 @@ msgstr "아카이브에 컨트롤 기록이 없습니다"
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "오류: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "경고: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s의 경로를 알아내는데 실패했습니다"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "트리에서 이동이 실패했습니다"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s 파일을 여는데 실패했습니다"
# FIXME: ??
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " 링크 %s [%s] 없애기\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s 파일에 readlink하는데 실패했습니다"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s 파일을 지우는데 실패했습니다"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -2289,30 +2290,30 @@ msgstr ""
"mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li일 %li시간 %li분 %li초"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li시간 %li분 %li초"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li분 %li초"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li초"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
@@ -2503,17 +2504,17 @@ msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받
msgid "Sub-process %s received signal %u."
msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s 파일을 열 수 없습니다"
@@ -2560,6 +2561,12 @@ msgstr "%s 파일을 삭제하는데 문제가 있습니다"
msgid "Problem syncing the file"
msgstr "파일을 동기화하는데 문제가 있습니다"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s에 키 모음을 설치하지 않았습니다."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "패키지 캐시가 비어 있습니다"
@@ -2968,8 +2975,8 @@ msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "해시 합이 맞지 않습니다"
@@ -3001,7 +3008,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3011,12 +3018,12 @@ msgstr ""
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3025,7 +3032,7 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,38 +3041,38 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Release 파일 %s에 섹션이 없습니다"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
@@ -3163,22 +3170,22 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n"
msgid "Source list entries for this disc are:\n"
msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "레코드 %i개를 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
@@ -3193,17 +3200,6 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
msgid "Hash mismatch for: %s"
msgstr "다음의 해시가 다릅니다: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s에 키 모음을 설치하지 않았습니다."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ku.po b/po/ku.po
index e584866a6..6f1e31484 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -1063,7 +1063,8 @@ msgid "%s was already not hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1344,7 +1345,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1357,29 +1358,29 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Di xebitandina gpgv de çewtiya nenas"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1690,87 +1691,87 @@ msgstr "Tomara kontrola arşîvê tuneye"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: pelrêça %s nayê xwendin\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s ji hev nehate veçirandin"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s venebû"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2110,30 +2111,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Hilbijartina %s nehatiye dîtin"
@@ -2324,17 +2325,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nikarî pelê %s veke"
@@ -2381,6 +2382,12 @@ msgstr "Di girtina pelî de pirsgirêkek derket"
msgid "Problem syncing the file"
msgstr ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tê betalkirin."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2775,8 +2782,8 @@ msgstr "nav guherandin biserneket, %s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "MD5Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
@@ -2808,7 +2815,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2816,56 +2823,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, 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:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakêt nehate dîtin %s"
@@ -2959,22 +2966,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i tomar hatin nivîsîn.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2989,17 +2996,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tê betalkirin."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/lt.po b/po/lt.po
index a7209df6a..d8e989382 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -1090,7 +1090,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1368,9 +1369,9 @@ msgid "Temporary failure resolving '%s'"
msgstr "Laikinas sutrikimas ieškant vardo „%s“"
#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s' (%s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Laikinas sutrikimas ieškant vardo „%s“"
#: methods/connect.cc:211
#, c-format
@@ -1382,28 +1383,28 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Nepavyko prisijungti prie %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Nežinoma klaida kviečiant gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Šie parašai buvo nevalidūs:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1777,87 +1778,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Į: Nepavyko perskaityti aplanko %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Į: Nepavyko patikrinti %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "K: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "Į: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "K: Klaidos failui "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nepavyko išspręsti %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Judesys medyje nepavyko"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nepavyko atverti %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nepavyko nuskaityti nuorodos %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nepavyko atsieti nuorodos %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepavyko susieti %s su %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s prižiūrėtojas yra %s, o ne %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2204,30 +2205,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2418,17 +2419,17 @@ msgstr "Procesas %s gavo segmentavimo klaidą"
msgid "Sub-process %s received signal %u."
msgstr "Procesas %s gavo segmentavimo klaidą"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Procesas %s grąžino klaidos kodą (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Procesas %s netikėtai išėjo"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nepavyko atverti failo %s"
@@ -2475,6 +2476,12 @@ msgstr "Klaida užveriant failą"
msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failą"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2874,8 +2881,8 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr "MD5 sumos neatitikimas"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
@@ -2907,7 +2914,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2915,56 +2922,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, 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:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
@@ -3058,22 +3065,22 @@ msgstr "Rašomas naujas šaltinių sąrašas\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3088,17 +3095,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/mr.po b/po/mr.po
index 3b2b8a45e..300573bd1 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -1162,7 +1162,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -1445,7 +1446,7 @@ msgstr "'%s' रिझॉल्व्ह करताना तात्पु
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
#: methods/connect.cc:211
@@ -1458,30 +1459,30 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
msgid "Unable to connect to %s:%s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "किमान एक अवैध सही सापडली."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "खालील सह्या अवैध आहेत:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1846,87 +1847,87 @@ msgstr "अर्काईव्ह मध्ये नियंत्रण म
msgid "Unable to get a cursor"
msgstr "संकेतक घेण्यास असमर्थ"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "धो.सू.:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s सोडवण्यास असमर्थ"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "ट्री चालणे असमर्थ"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s उघडण्यास असमर्थ"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "%s [%s] डी दुवा\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s वाचणारा दुवा असमर्थ"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s दुवा काढण्यास असमर्थ"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "%s चा %s दुवा साधण्यास असमर्थ"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB हीट ची डिलींक मर्यादा\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -2271,30 +2272,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "%s निवडक भाग सापडत नाही"
@@ -2485,17 +2486,17 @@ msgstr "%s उपक्रियेला सेगमेंटेशन दो
msgid "Sub-process %s received signal %u."
msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s फाईल उघडता येत नाही"
@@ -2542,6 +2543,12 @@ msgstr "फाईल अनलिंकिंग करण्यात अडच
msgid "Problem syncing the file"
msgstr "संचिकेची syncing समस्या"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "संस्थापन खंडित करत आहे."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "पॅकेज अस्थाई स्मृतिकोष"
@@ -2951,8 +2958,8 @@ msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s
msgid "MD5Sum mismatch"
msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जुळत नाही"
@@ -2984,7 +2991,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2992,12 +2999,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3006,7 +3013,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3015,7 +3022,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3023,31 +3030,31 @@ msgstr ""
"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
"ठिकाण %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "आकार जुळतनाही"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
@@ -3145,22 +3152,22 @@ msgstr "नविन स्त्रोत सूची लिहित आह
msgid "Source list entries for this disc are:\n"
msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i माहितीसंच लिहिले.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
@@ -3175,17 +3182,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "हॅश बेरीज जुळत नाही"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "संस्थापन खंडित करत आहे."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/nb.po b/po/nb.po
index b51e2be57..99544811d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1188,7 +1188,8 @@ msgid "%s was already not hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -1473,7 +1474,7 @@ msgstr "Midlertidig feil ved oppslag av «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1486,29 +1487,29 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikke koble til %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Ukjent feil ved kjøring av gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "De følgende signaturene var ugyldige:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1880,87 +1881,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikke å finne en peker"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Klarte ikke å lese katalogen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Klarte ikke å få statusen på %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikke å slå opp %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Klarte ikke å finne fram i treet"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikke å åpne %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikke å lese lenken %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikke å oppheve lenken %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikke å lenke %s til %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %s B er nådd.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppføring\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binæroverstyringsoppføring heller\n"
@@ -2311,30 +2312,30 @@ msgstr ""
"av brukeren."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lit %lim %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lit %lim %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%lim %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -2525,17 +2526,17 @@ msgstr "Underprosessen %s mottok et minnefeilsignal."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok signalet %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s ga en feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avsluttet uventet"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikke åpne fila %s"
@@ -2582,6 +2583,12 @@ msgstr "Problem ved oppheving av lenke til fila %s"
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøkkelring installert i %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2990,8 +2997,8 @@ msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
@@ -3024,7 +3031,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3034,12 +3041,12 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3048,7 +3055,7 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3057,37 +3064,37 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Feil størrelse"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen avsnitt i Release-fila %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen sjekksumoppføring i Release-fila %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
@@ -3187,22 +3194,22 @@ msgstr "Skriver ny kildeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppføringer for denne CD-en er:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i feile filer.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3217,17 +3224,6 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsummen stemmer ikke for: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøkkelring installert i %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ne.po b/po/ne.po
index 02c55d0d8..d24645449 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -1160,7 +1160,8 @@ msgid "%s was already not hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -1443,7 +1444,7 @@ msgstr "'%s' हल गर्दा अस्थायी असफल"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
#: methods/connect.cc:211
@@ -1456,29 +1457,29 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
msgid "Unable to connect to %s:%s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1843,87 +1844,87 @@ msgstr "संग्रह संग नियन्त्रण रेकर्
msgid "Unable to get a cursor"
msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s स्थिर गर्न असक्षम\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s हल गर्न असफल भयो"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "ट्री हिडाईँ असफल भयो"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s खोल्न असफल"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "लिङ्क पढ्न असफल %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "अनलिङ्क गर्न असफल %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s मा %s लिङ्क असफल भयो"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -2268,30 +2269,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "चयन %s फेला पार्न सकिएन"
@@ -2482,17 +2483,17 @@ msgstr "सहायक प्रक्रिया %s ले खण्डिक
msgid "Sub-process %s received signal %u."
msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "फाइल %s खोल्न सकिएन"
@@ -2539,6 +2540,12 @@ msgstr "फाइल अनलिङ्क गर्दा समस्या"
msgid "Problem syncing the file"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "स्थापना परित्याग गरिदैछ ।"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "खाली प्याकेज क्यास"
@@ -2944,8 +2951,8 @@ msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s)
msgid "MD5Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भएन"
@@ -2978,7 +2985,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2986,12 +2993,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,7 +3007,7 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3009,37 +3016,37 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् ।"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "साइज मेल खाएन"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
@@ -3136,22 +3143,22 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
msgid "Source list entries for this disc are:\n"
msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i रेकर्डहरू लेखियो ।\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
@@ -3166,17 +3173,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "स्थापना परित्याग गरिदैछ ।"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/nl.po b/po/nl.po
index fc47d1e3f..4e4384919 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -1205,7 +1205,8 @@ msgid "%s was already not hold.\n"
msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -1489,7 +1490,7 @@ msgstr "Tijdelijke fout bij het opzoeken van '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1502,32 +1503,32 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kan geen verbinding maken met %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Er is tenminste één ongeldige ondertekening gevonden."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv "
"geïnstalleerd?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Onbekende fout bij het uitvoeren van gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "De volgende ondertekeningen waren ongeldig:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1908,87 +1909,87 @@ msgstr "Archief heeft geen 'control'-record"
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kon map %s niet lezen\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kon de status van %s niet opvragen\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Er zijn fouten van toepassing op het bestand "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Oplossen van %s is mislukt"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Doorlopen boomstructuur is mislukt"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Openen van %s is mislukt"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " OntlLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink op %s is mislukt"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Ontlinken van %s is mislukt"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linken van %s aan %s is mislukt"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB bereikt.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -2338,30 +2339,30 @@ msgstr ""
"door de gebruiker is uitgeschakeld."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %liu %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liu %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -2560,17 +2561,17 @@ msgstr "Subproces %s ontving een segmentatiefout."
msgid "Sub-process %s received signal %u."
msgstr "Subproces %s ontving signaal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subproces %s gaf de foutcode %u terug"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subproces %s sloot onverwacht af"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Kon het bestand %s niet openen"
@@ -2617,6 +2618,12 @@ msgstr "Probleem bij het ontlinken van het bestand %s"
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Geen sleutelring geïnstalleerd in %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Lege pakketcache"
@@ -3038,8 +3045,8 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
@@ -3072,7 +3079,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3083,12 +3090,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3097,7 +3104,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, fuzzy, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,7 +3113,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3114,31 +3121,31 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Geen secties in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Geen Hash-vermelding in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Geen 'Date'-vermelding in Release-bestand %s"
@@ -3238,22 +3245,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n"
msgid "Source list entries for this disc are:\n"
msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i records weggeschreven.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i records weggeschreven met %i missende bestanden.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, 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:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3270,17 +3277,6 @@ msgstr "Kan geen authenticatierecord vinden voor: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-som komt niet overeen voor: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Geen sleutelring geïnstalleerd in %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/nn.po b/po/nn.po
index 9c4e9970e..1b1eb7fd3 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1175,7 +1175,8 @@ msgid "%s was already not hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -1460,7 +1461,7 @@ msgstr "Mellombels feil ved oppslag av %s"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
#: methods/connect.cc:211
@@ -1473,29 +1474,29 @@ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1855,87 +1856,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikkje f peikar"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ": Klarte ikkje lesa katalogen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ": Klarte ikkje f status til %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr ": "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikkje sl opp %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Treklatring mislukkast"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikkje opna %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikkje lesa lenkja %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikkje oppheva lenkja %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikkje lenkja %s til %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -2281,30 +2282,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -2495,17 +2496,17 @@ msgstr "Underprosessen %s mottok ein segmenteringsfeil."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avslutta uventa"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikkje opna fila %s"
@@ -2552,6 +2553,12 @@ msgstr "Problem ved oppheving av lenkje til fila"
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2963,8 +2970,8 @@ msgstr "endring av namn mislukkast, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
@@ -2997,7 +3004,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3005,12 +3012,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3019,7 +3026,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3027,38 +3034,38 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Feil storleik"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Merk, vel %s i staden for %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig linje i avleiingsfila: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
@@ -3155,22 +3162,22 @@ msgstr "Skriv ny kjeldeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppfringar for denne disken er:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skreiv %i postar.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skreiv %i postar med %i manglande filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3185,17 +3192,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Feil MD5-sum"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/pl.po b/po/pl.po
index d8e9d2490..218b37693 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -1222,7 +1222,8 @@ msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -1530,7 +1531,7 @@ msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
#: methods/connect.cc:211
@@ -1543,31 +1544,31 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nie udało się połączyć z %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest "
"zainstalowane?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Nieznany błąd podczas uruchamiania gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Następujące podpisy były błędne:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1941,87 +1942,87 @@ msgstr "Archiwum nie posiada rekordu kontrolnego"
msgid "Unable to get a cursor"
msgstr "Nie udało się pobrać kursora"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nie udało się odczytać katalogu %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nie można wykonać operacji stat na %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Błędy odnoszą się do pliku "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nie udało się przetłumaczyć nazwy %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Przejście po drzewie nie powiodło się"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nie udało się otworzyć %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odłączenie %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie udało się odczytać dowiązania %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie udało się usunąć %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nie udało się dowiązać %s do %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -2371,30 +2372,30 @@ msgstr ""
"zostało wyłączone przez użytkownika."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lidni %lig %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lig %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -2592,17 +2593,17 @@ msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s otrzymał sygnał %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s zwrócił kod błędu (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s zakończył się niespodziewanie"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nie udało się otworzyć pliku %s"
@@ -2649,6 +2650,12 @@ msgstr "Problem przy odlinkowywaniu pliku %s"
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Brak zainstalowanej bazy kluczy w %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Pusty magazyn podręczny pakietów"
@@ -3061,8 +3068,8 @@ msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "Błędna suma MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
@@ -3098,7 +3105,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3108,12 +3115,12 @@ msgstr ""
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3122,7 +3129,7 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3131,38 +3138,38 @@ msgstr ""
"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:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Błędny rozmiar"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nie udało się przeanalizować pliku Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Brak sekcji w pliku Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Brak wpisu Hash w pliku Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nieprawidłowy wpis Date w pliku Release %s"
@@ -3262,22 +3269,22 @@ msgstr "Zapisywanie nowej listy źródeł\n"
msgid "Source list entries for this disc are:\n"
msgstr "Źródła dla tej płyty to:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisano %i rekordów.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3292,17 +3299,6 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
msgid "Hash mismatch for: %s"
msgstr "Błędna suma kontrolna dla: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Brak zainstalowanej bazy kluczy w %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3548,6 +3544,9 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Pomijanie nieistniejącego pliku %s"
diff --git a/po/pt.po b/po/pt.po
index b6b5d8b0b..073a34c0b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1201,7 +1201,8 @@ msgid "%s was already not hold.\n"
msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -1504,7 +1505,7 @@ msgstr "Falha temporária a resolver '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1517,32 +1518,32 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Não foi possível ligar a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido ao executar gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1916,87 +1917,87 @@ msgstr "O arquivo não tem registo de controlo"
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Não foi possível ler o directório %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Não foi possível fazer stat %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Os erros aplicam-se ao ficheiro "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou resolver %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Falhou abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou o readlink %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou o unlink %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ligar %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -2344,30 +2345,30 @@ msgstr ""
"está desabilitado pelo utilizador."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "A selecção %s não foi encontrada"
@@ -2569,17 +2570,17 @@ msgstr "O sub-processo %s recebeu uma falha de segmentação."
msgid "Sub-process %s received signal %u."
msgstr "O sub-processo %s recebeu o sinal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O sub-processo %s terminou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir ficheiro o %s"
@@ -2626,6 +2627,12 @@ msgstr "Problema ao remover o link do ficheiro %s"
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nenhum keyring instalado em %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache de pacotes vazia"
@@ -3049,8 +3056,8 @@ msgstr "falhou renomear, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum não coincide"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
@@ -3088,7 +3095,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3099,12 +3106,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3114,7 +3121,7 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3123,7 +3130,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3131,31 +3138,31 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Não foi possível fazer parse ao ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Nenhuma secção, no ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nenhuma entrada hash no ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
@@ -3255,22 +3262,22 @@ msgstr "A escrever lista de novas source\n"
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escreveu %i registos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3287,17 +3294,6 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash não coincide para: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "O ficheiro %s não começa com uma mensagem assinada"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nenhum keyring instalado em %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3539,6 +3535,9 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "O ficheiro %s não começa com uma mensagem assinada"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "A saltar ficheiro %s inexistente"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bc73f09d6..b4ecf3ed0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -1190,7 +1190,8 @@ msgid "%s was already not hold.\n"
msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -1473,7 +1474,7 @@ msgstr "Falha temporária resolvendo '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1486,33 +1487,33 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Ao menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido executando gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1886,87 +1887,87 @@ msgstr "Repositório não possui registro de controle"
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Impossível ler o diretório %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Impossível executar \"stat\" em %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Erros que se aplicam ao arquivo "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou ao resolver %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Falhou ao abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou ao executar \"readlink\" %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou ao executar \"unlink\" %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ao ligar %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -2313,30 +2314,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
@@ -2530,17 +2531,17 @@ msgstr "Sub-processo %s recebeu uma falha de segmentação."
msgid "Sub-process %s received signal %u."
msgstr "Sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir arquivo %s"
@@ -2587,6 +2588,12 @@ msgstr "Problema removendo o arquivo"
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando instalação."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache de pacotes vazio"
@@ -3007,8 +3014,8 @@ msgstr "renomeação falhou, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
@@ -3040,7 +3047,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3048,12 +3055,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3063,7 +3070,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,7 +3079,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3080,31 +3087,31 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
"\" para o pacote %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Nota, selecionando %s ao invés de %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linha inválida no arquivo de desvios: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
@@ -3202,22 +3209,22 @@ msgstr "Gravando nova lista de fontes\n"
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:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Gravados %i registros.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Gravados %i registros com %i arquivos faltando.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Gravados %i registros com %i arquivos que não combinam\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3234,17 +3241,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum incorreto"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortando instalação."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ro.po b/po/ro.po
index f21f604ad..662d0c729 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -1192,7 +1192,8 @@ msgid "%s was already not hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -1478,7 +1479,7 @@ msgstr "Eșec temporar la rezolvarea lui „%s”"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
#: methods/connect.cc:211
@@ -1491,32 +1492,32 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, 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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Eroare necunoscută în timp ce se execută gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Următoarele semnături nu au fost valide:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1893,87 +1894,87 @@ msgstr "Arhiva nu are înregistrare de control"
msgid "Unable to get a cursor"
msgstr "Nu s-a putut obține un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nu s-a putut citi directorul %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Erori la fișierul "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Eșec la „resolve” pentru %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Parcurgerea arborelui a eșuat"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Eșec la „open” pentru %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Dezlegare %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Eșec la „readlink” pentru %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Eșec la „unlink” pentru %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Eșec la „link” între %s și %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -2323,30 +2324,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selecția %s nu a fost găsită"
@@ -2540,17 +2541,17 @@ msgstr "Subprocesul %s a primit o eroare de segmentare."
msgid "Sub-process %s received signal %u."
msgstr "Subprocesul %s a primit o eroare de segmentare."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subprocesul %s a întors un cod de eroare (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subprocesul %s s-a terminat brusc"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nu s-a putut deschide fișierul %s"
@@ -2597,6 +2598,12 @@ msgstr "Problemă la dezlegarea fișierului"
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fișierului"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache gol de pachet"
@@ -3012,8 +3019,8 @@ msgstr "redenumire eșuată, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
@@ -3047,7 +3054,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3055,12 +3062,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3069,7 +3076,7 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3078,7 +3085,7 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să depanați manual acest pachet."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3086,31 +3093,31 @@ msgstr ""
"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
@@ -3209,22 +3216,22 @@ msgstr "Scriere noua listă sursă\n"
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "S-au scris %i înregistrări.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3240,17 +3247,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abandonez instalarea."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ru.po b/po/ru.po
index 488881aa5..73fed5e39 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1217,7 +1217,8 @@ msgid "%s was already not hold.\n"
msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -1526,7 +1527,7 @@ msgstr "Временная ошибка при попытке получить I
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1539,30 +1540,30 @@ msgstr "Что-то странное произошло при определе
msgid "Unable to connect to %s:%s:"
msgstr "Невозможно соединиться с %s: %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Найдена как минимум одна неправильная подпись."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Неизвестная ошибка при выполнении gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Следующие подписи неверные:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1938,87 +1939,87 @@ msgstr "В архиве нет поля control"
msgid "Unable to get a cursor"
msgstr "Невозможно получить курсор"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Не удалось прочитать каталог %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Не удалось прочитать атрибуты %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Ошибки относятся к файлу "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Не удалось проследовать по ссылке %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Не удалось совершить обход дерева"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Не удалось открыть %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Не удалось прочесть ссылку %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Не удалось удалить %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не удалось создать ссылку %s на %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -2367,30 +2368,30 @@ msgstr ""
"отключено пользователем."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liч %liмин %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liч %liмин %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liмин %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Не найдено: %s"
@@ -2592,17 +2593,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr "Порождённый процесс %s получил сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Порождённый процесс %s неожиданно завершился"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Не удалось открыть файл %s"
@@ -2650,6 +2651,12 @@ msgstr "Проблема при удалении файла %s"
msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файла"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Связка ключей в %s не установлена."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Кэш пакетов пуст"
@@ -3068,8 +3075,8 @@ msgstr "переименовать не удалось, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Хеш сумма не совпадает"
@@ -3105,7 +3112,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3115,12 +3122,12 @@ msgstr ""
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3129,7 +3136,7 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3138,37 +3145,37 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Не совпадает размер"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Невозможно разобрать содержимое файла Release (%s)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Отсутствуют разделы в файле Release (%s)"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправильный элемент «Date» в файле Release %s"
@@ -3268,22 +3275,22 @@ msgstr "Запись нового списка источников\n"
msgid "Source list entries for this disc are:\n"
msgstr "Записи в списке источников для этого диска:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Сохранено %i записей.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3300,17 +3307,6 @@ msgstr "Не удалось найти аутентификационную за
msgid "Hash mismatch for: %s"
msgstr "Не совпадает хеш сумма для: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Связка ключей в %s не установлена."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3552,6 +3548,9 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускается несуществующий файл %s"
diff --git a/po/sk.po b/po/sk.po
index 8fb8e84e4..d90f50995 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1199,7 +1199,8 @@ msgid "%s was already not hold.\n"
msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -1501,7 +1502,7 @@ msgstr "Dočasné zlyhanie pri preklade „%s“"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
#: methods/connect.cc:211
@@ -1514,28 +1515,28 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nedá sa pripojiť k %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Neznáma chyba pri spustení gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1903,87 +1904,87 @@ msgstr "Archív nemá riadiaci záznam"
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Adresár %s sa nedá čítať\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s sa nedá vyhodnotiť\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Chyby sa týkajú súboru "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba pri preklade %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Prechod stromom zlyhal"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s sa nedá otvoriť"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odlinkovanie %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie je možné vykonať readlink %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie je možné vykonať unlink %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepodarilo sa zlinkovať %s s %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -2329,30 +2330,30 @@ msgstr ""
"používateľ."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li d %li h %li min %li s"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li h %li min %li s"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li min %li s"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -2546,17 +2547,17 @@ msgstr "Podproces %s obdržal chybu segmentácie."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s dostal signál %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočakávane skončil"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nedá sa otvoriť súbor %s"
@@ -2603,6 +2604,12 @@ msgstr "Problém pri odstraňovaní súboru %s"
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Vyrovnávacia pamäť balíkov je prázdna"
@@ -3011,8 +3018,8 @@ msgstr "premenovanie zlyhalo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Nezhoda kontrolných MD5 súčtov"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haš súčtov"
@@ -3048,7 +3055,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3058,12 +3065,12 @@ msgstr ""
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,7 +3079,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3081,37 +3088,37 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nedá spracovať súbor Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Žiadne sekcie v Release súbore %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Chýba položka „Hash“ v súbore Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Chýba položka „Date“ v súbore Release %s"
@@ -3211,22 +3218,22 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n"
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapísaných %i záznamov.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3241,17 +3248,6 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
msgid "Hash mismatch for: %s"
msgstr "Nezhoda kontrolných haš súčtov: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3484,6 +3480,9 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Preskakuje sa neexistujúci súbor %s"
diff --git a/po/sl.po b/po/sl.po
index ead4d1090..ff4a0f09b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -1198,7 +1198,8 @@ msgid "%s was already not hold.\n"
msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -1499,7 +1500,7 @@ msgstr "Začasna napaka med razreševanjem '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1512,29 +1513,29 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Ni se mogoče povezati z %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Najden je bil vsaj en neveljaven podpis."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Neznana napaka med izvajanjem gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Naslednji podpisi so bili neveljavni:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1902,87 +1903,87 @@ msgstr "Arhiv nima nadzornega zapisa"
msgid "Unable to get a cursor"
msgstr "Ni mogoče najti kazalke"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "O: ni mogoče brati mape %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "O: Ni mogoče določiti %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "O: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "N: Napake se sklicujejo na datoteko "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Ni mogoče razrešiti %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Hoja drevesa je spodletela"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Ni mogoče odprti %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " RazVeži %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Napaka med branjem povezave %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Napaka med odvezovanjem %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Napaka med povezovanjem %s in %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Dosežena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prepisanega vnosa\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrževalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima izvornega vnosa prepisa\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima tudi binarnega vnosa prepisa\n"
@@ -2329,30 +2330,30 @@ msgstr ""
"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Izbire %s ni mogoče najti"
@@ -2546,17 +2547,17 @@ msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
msgid "Sub-process %s received signal %u."
msgstr "Pod-opravilo %s je prejelo signal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Ni mogoče odpreti datoteke %s"
@@ -2603,6 +2604,12 @@ msgstr "Težava med razvezovanjem datoteke %s"
msgid "Problem syncing the file"
msgstr "Težava med usklajevanjem datoteke"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s ni nameščenih zbirk ključev."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Prazen predpomnilnik paketov"
@@ -3014,8 +3021,8 @@ msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote razpršil"
@@ -3051,7 +3058,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3061,12 +3068,12 @@ msgstr ""
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3075,7 +3082,7 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket (zaradi manjkajočega arhiva)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3084,7 +3091,7 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3092,31 +3099,31 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
"%s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni mogoče razčleniti Release datoteke %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ni izbir v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ni vnosa razpršila v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
@@ -3216,22 +3223,22 @@ msgstr "Pisanje novega seznama virov\n"
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta disk so:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisanih je bilo %i zapisov.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3248,17 +3255,6 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
msgid "Hash mismatch for: %s"
msgstr "Neujemanje razpršila za: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s ni nameščenih zbirk ključev."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3491,6 +3487,9 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Preskok neobstoječe datoteke %s"
diff --git a/po/sv.po b/po/sv.po
index 7ba779a6f..04a75e602 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -1200,7 +1200,8 @@ msgid "%s was already not hold.\n"
msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -1487,7 +1488,7 @@ msgstr "Temporärt fel vid uppslagning av \"%s\""
# Okänd felkod; %i = koden
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
# Okänd felkod; %i = koden
@@ -1501,31 +1502,31 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kunde inte ansluta till %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Minst en ogiltig signatur träffades på."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Okänt fel vid körning av gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1897,90 +1898,90 @@ msgstr "Arkivet har ingen styrpost"
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "V: Kunde inte läsa katalogen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "V: Kunde inte ta status på %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "V: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Felen gäller filen "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Misslyckades med att slå upp %s"
# ???
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Trädvandring misslyckades"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Misslyckades med att öppna %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Avlänka %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Misslyckades med att läsa länken %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Misslyckades med att länka ut %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Misslyckades med att länka %s till %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgränsen på %sB nåddes.\n"
# Fält vid namn "Package"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -2330,30 +2331,30 @@ msgstr ""
"av användaren."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s hittades inte"
@@ -2545,17 +2546,17 @@ msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s tog emot signal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s svarade med en felkod (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s avslutades oväntat"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Kunde inte öppna filen %s"
@@ -2602,6 +2603,12 @@ msgstr "Problem med att avlänka filen %s"
msgid "Problem syncing the file"
msgstr "Problem med att synkronisera filen"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nyckelring installerad i %s."
+
# Felmeddelande
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
@@ -3017,8 +3024,8 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
@@ -3050,7 +3057,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3061,12 +3068,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3075,7 +3082,7 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3084,37 +3091,37 @@ msgstr ""
"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:1753
+#: apt-pkg/acquire-item.cc:1759
#, 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:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Inga sektioner i Release-filen %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen Hash-post i Release-filen %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ogiltig \"Date\"-post i Release-filen %s"
@@ -3214,22 +3221,22 @@ msgstr "Skriver ny källista\n"
msgid "Source list entries for this disc are:\n"
msgstr "Poster i källistan för denna skiva:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i saknade filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i filer som inte stämmer\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, 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"
@@ -3244,17 +3251,6 @@ msgstr "Kan inte hitta autentiseringspost för: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-kontrollsumman stämmer inte för: %s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/th.po b/po/th.po
index ef2b6a45d..cfa65481b 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-10-27 22:44+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -1159,7 +1159,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -1456,7 +1457,7 @@ msgstr "เกิดข้อผิดพลาดชั่วคราวขณ
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1469,28 +1470,28 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
msgid "Unable to connect to %s:%s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1846,87 +1847,87 @@ msgstr "แพกเกจไม่มีระเบียนควบคุม
msgid "Unable to get a cursor"
msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: stat %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "เปิด %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -2270,30 +2271,30 @@ msgid ""
msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liวัน %liชม. %liนาที %liวิ"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liชม. %liนาที %liวิ"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liนาที %liวิ"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liวิ"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "ไม่พบรายการเลือก %s"
@@ -2484,17 +2485,17 @@ msgstr "โพรเซสย่อย %s เกิดข้อผิดพล
msgid "Sub-process %s received signal %u."
msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "ไม่สามารถเปิดแฟ้ม %s"
@@ -2541,6 +2542,12 @@ msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
msgid "Problem syncing the file"
msgstr "เกิดปัญหาขณะ sync แฟ้ม"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "แคชของแพกเกจว่างเปล่า"
@@ -2943,8 +2950,8 @@ msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s ->
msgid "MD5Sum mismatch"
msgstr "MD5Sum ไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "ผลรวมแฮชไม่ตรงกัน"
@@ -2980,7 +2987,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2990,56 +2997,56 @@ msgstr ""
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, 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:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงกัน"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
@@ -3137,22 +3144,22 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ
msgid "Source list entries for this disc are:\n"
msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "เขียนแล้ว %i ระเบียน\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
@@ -3167,17 +3174,6 @@ msgstr "ไม่พบระเบียนยืนยันความแท
msgid "Hash mismatch for: %s"
msgstr "แฮชไม่ตรงกันสำหรับ: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3399,6 +3395,9 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
+
#~ msgid "Failed to remove %s"
#~ msgstr "ไม่สามารถลบ %s"
diff --git a/po/tl.po b/po/tl.po
index 85f159546..19ef31f20 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1182,7 +1182,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -1465,7 +1466,7 @@ msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1478,32 +1479,32 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Hindi maka-konekta sa %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, 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:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Hindi kilalang error sa pag-execute ng gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1876,87 +1877,87 @@ msgstr "Walang kontrol rekord ang arkibo"
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Hindi mabasa ang directory %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Hindi ma-stat %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Mga error ay tumutukoy sa talaksang "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Bigo sa pag-resolba ng %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Bigo ang paglakad sa puno"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Bigo ang pagbukas ng %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Bigo ang pagbasa ng link %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Bigo ang pag-unlink ng %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Bigo ang pag-link ng %s sa %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -2303,30 +2304,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -2524,17 +2525,17 @@ msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Naghudyat ang sub-process %s ng error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Hindi mabuksan ang talaksang %s"
@@ -2581,6 +2582,12 @@ msgstr "Problema sa pag-unlink ng talaksan"
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng talaksan"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Walang laman ang cache ng pakete"
@@ -2996,8 +3003,8 @@ msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
@@ -3030,7 +3037,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3038,12 +3045,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,7 +3059,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3068,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3069,31 +3076,31 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Di tugmang laki"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Di tanggap na linya sa talaksang diversion: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
@@ -3192,22 +3199,22 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
msgid "Source list entries for this disc are:\n"
msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Nagsulat ng %i na record.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3224,17 +3231,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Ina-abort ang pag-instol."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/uk.po b/po/uk.po
index cfad1393a..6fa9320c9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -1216,7 +1216,8 @@ msgid "%s was already not hold.\n"
msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
@@ -1520,7 +1521,7 @@ msgstr "Тимчасова помилка при отриманні IP адре
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1533,30 +1534,30 @@ msgstr "Сталося щось дивне при спробі отримати
msgid "Unable to connect to %s:%s:"
msgstr "Неможливо під'єднатися до %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
"відбиток?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Знайдено як мінімум один невірний підпис."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Невідома помилка виконання gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Наступні підписи були невірними:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1937,87 +1938,87 @@ msgstr "В архіві немає запису 'control'"
msgid "Unable to get a cursor"
msgstr "Неможливо одержати курсор"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "У: Не вдалося прочитати директорію %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "У: Неможливо прочитати атрибути %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "П: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "У: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "П: Помилки відносяться до файлу "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Не вдалося визначити %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Не вдалося зробити обхід дерева"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Не вдалося відкрити %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Не вдалося прочитати посилання (readlink) %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Не вдалося видалити посилання (unlink) %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не вдалося створити посилання %s на %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Перевищено ліміт в %sB в DeLink.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Архів не мав поля 'package'"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, fuzzy, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення (override) для %s\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжується %s, а не %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n"
@@ -2370,30 +2371,30 @@ msgstr ""
"користувачем."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liг %liхв %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liг %liхв %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liхв %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Вибір %s не знайдено"
@@ -2594,17 +2595,17 @@ msgstr "Підпроцес %s отримав 'segmentation fault' (фаталь
msgid "Sub-process %s received signal %u."
msgstr "Підпроцес %s отримав сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Підпроцес %s повернув код помилки (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Підпроцес %s раптово завершився"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Неможливо відкрити файл %s"
@@ -2651,6 +2652,12 @@ msgstr "Проблема з роз'єднанням файла %s"
msgid "Problem syncing the file"
msgstr "Проблема з синхронізацією файла"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Не встановлено 'keyring' у %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Кеш пакунків пустий"
@@ -3062,8 +3069,8 @@ msgstr "не вдалося перейменувати, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Невідповідність MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Невідповідність хешу MD5Sum"
@@ -3099,7 +3106,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3109,12 +3116,12 @@ msgstr ""
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3123,7 +3130,7 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3132,38 +3139,38 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Невідповідність розміру"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неможливо проаналізувати 'Release' файл %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Немає секцій у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Невірний запис 'Date' у 'Release' файлі %s"
@@ -3263,22 +3270,22 @@ msgstr "Записується новий перелік вихідних тек
msgid "Source list entries for this disc are:\n"
msgstr "Перелік вихідних текстів для цього диска:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записано %i записів.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записано %i записів з %i відсутніми файлами.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записано %i записів з %i невідповідними файлам\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
@@ -3293,17 +3300,6 @@ msgstr "Неможливо знайти аутентифікаційний за
msgid "Hash mismatch for: %s"
msgstr "Невідповідність хешу для: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Файл %s починається з не 'clearsigned' повідомленням"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Не встановлено 'keyring' у %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3547,6 +3543,9 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблоковано"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Файл %s починається з не 'clearsigned' повідомленням"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускається неіснуючий файл %s"
diff --git a/po/vi.po b/po/vi.po
index ac756e31d..b81b8453a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-11-20 14:12+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -1194,7 +1194,8 @@ msgid "%s was already not hold.\n"
msgstr "%s đã sẵn được đặt là chưa nắm giữ.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Đã đợi %s nhưng mà chưa gặp nó"
@@ -1497,7 +1498,7 @@ msgstr "Việc tháo gỡ “%s” bị lỗi tạm thời"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
#: methods/connect.cc:211
@@ -1510,30 +1511,30 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Không thể kết nối đến %s: %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
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 của khóa ?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
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:189
+#: methods/gpgv.cc:178
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ài đặt chưa?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Gặp lỗi không rõ khi thực hiện gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
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:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1924,87 +1925,87 @@ msgstr "Kho không có mục ghi điều khiển"
msgid "Unable to get a cursor"
msgstr "Không thể lấy con chạy"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "CB: Không thể đọc thư mục %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "CB: Không thể lấy thông tin toàn bộ cho %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "LỖI: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "CB: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "LỖI: có lỗi áp dụng vào tập tin "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Việc quyết định %s bị lỗi"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Việc di chuyển qua cây bị lỗi"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Việc mở %s bị lỗi"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Bỏ liên kết %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Việc tạo liên kết lại %s bị lỗi"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Việc bỏ liên kết %s bị lỗi"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Việc liên kết %s đến %s bị lỗi"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo trì %s là %s không phải %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè nguồn\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè nhị phân\n"
@@ -2355,30 +2356,30 @@ msgstr ""
"dùng tắt."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lingày %ligiờ %liphút %ligiây"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%ligiờ %liphút %ligiây"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liphút %ligiây"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%ligiây"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
@@ -2574,17 +2575,17 @@ msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn."
msgid "Sub-process %s received signal %u."
msgstr "Tiến trình phụ %s đã nhận tín hiệu %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Tiến trình phụ %s đã trả lời mã lỗi (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Tiến trình phụ %s đã thoát bất thường"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Không thể mở tập tin %s"
@@ -2631,6 +2632,12 @@ msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
msgid "Problem syncing the file"
msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, 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/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Bộ nhớ tạm gói trống"
@@ -3049,8 +3056,8 @@ msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
msgid "MD5Sum mismatch"
msgstr "Sai khớp MD5Sum (tổng kiểm)"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)"
@@ -3086,7 +3093,7 @@ msgstr ""
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:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3097,12 +3104,12 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3111,7 +3118,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3120,7 +3127,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3128,33 +3135,33 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Sai khớp kích cỡ"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Không có phần nào trong tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
"Gặp mục nhập “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
"hành %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
@@ -3254,22 +3261,22 @@ msgstr "Đang ghi danh sách nguồn mới\n"
msgid "Source list entries for this disc are:\n"
msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Mới ghi %i mục ghi.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, 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:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, 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:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3286,17 +3293,6 @@ msgstr "Không tìm thấy mục ghi xác thực cho: %s"
msgid "Hash mismatch for: %s"
msgstr "Sai khớp chuỗi duy nhất cho: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, 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:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3523,6 +3519,9 @@ msgstr "dpkg bị gián đoạn, bạn cần phải tự động chạy “%s”
msgid "Not locked"
msgstr "Chưa được khoá"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d4ec54b3d..841087b48 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1160,7 +1160,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -1442,7 +1443,7 @@ msgstr "暂时不能解析域名“%s”"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
#: methods/connect.cc:211
@@ -1455,28 +1456,28 @@ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1835,87 +1836,87 @@ msgstr "归档文件没有包含控制字段"
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -2259,30 +2260,30 @@ msgid ""
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -2473,17 +2474,17 @@ msgstr "子进程 %s 发生了段错误"
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
@@ -2530,6 +2531,12 @@ msgstr "用 unlink 删除文件 %s 出错"
msgid "Problem syncing the file"
msgstr "同步文件出错"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
@@ -2936,8 +2943,8 @@ msgstr "无法重命名文件,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
@@ -2969,7 +2976,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2978,12 +2985,12 @@ msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2992,7 +2999,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,37 +3007,37 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3130,22 +3137,22 @@ msgstr "正在写入新的源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -3160,17 +3167,6 @@ msgstr "无法找到认证记录:%s"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 47fa334ae..28f0c6545 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -1156,7 +1156,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -1437,7 +1438,7 @@ msgstr "暫時無法解析 '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
#: methods/connect.cc:211
@@ -1450,29 +1451,29 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "內部錯誤:簽章無誤,但卻無法辨識密鑰的指紋碼?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "至少發現一個無效的簽章。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "無法執行 '%s' 來驗證簽章(gpgv 是否安裝了?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "在執行 gpgv 時發生未知的錯誤"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "以下簽名無效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1832,87 +1833,87 @@ msgstr "套件檔沒有 control 記錄"
msgid "Unable to get a cursor"
msgstr "無法取得遊標"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:無法讀取目錄 %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:無法取得 %s 狀態\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "錯誤:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "錯誤:套用到檔案時發生錯誤"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "無法解析 %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "無法走訪目錄樹"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "無法開啟 %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "無法讀取連結 %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "無法移除連結 %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 無法將 %s 連結到 %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -2257,30 +2258,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
@@ -2471,17 +2472,17 @@ msgstr "子程序 %s 收到一個記憶體錯誤。"
msgid "Sub-process %s received signal %u."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 傳回錯誤碼 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期得結束"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "無法開啟檔案 %s"
@@ -2528,6 +2529,12 @@ msgstr "在刪除檔案時發生問題"
msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "放棄安裝。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "清空套件快取"
@@ -2928,8 +2935,8 @@ msgstr "無法重新命名,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5Sum 不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
@@ -2961,7 +2968,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2969,12 +2976,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2983,44 +2990,44 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, 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."
msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "在 Release 檔 %s 裡沒有區段"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
@@ -3116,22 +3123,22 @@ msgstr "正在寫入新的來源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "寫入 %i 筆紀錄。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案不符\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了,有 %i 個檔案不符\n"
@@ -3146,17 +3153,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum 不符"
-#: apt-pkg/indexcopy.cc:665
-#, 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:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "放棄安裝。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/test/integration/framework b/test/integration/framework
index 4a70573c8..31b12e8bf 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -339,9 +339,15 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
fi
echo '3.0 (native)' > ${BUILDDIR}/debian/source/format
- local SRCS="$( (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
- for SRC in $SRCS; do
+ (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | sed -n 's#^dpkg-source: info: building [^ ]\+ in ##p' \
+ | while read SRC; do
echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
+# if expr match "${SRC}" '.*\.dsc' >/dev/null 2>&1; then
+# gpg --yes --no-default-keyring --secret-keyring ./keys/joesixpack.sec \
+# --keyring ./keys/joesixpack.pub --default-key 'Joe Sixpack' \
+# --clearsign -o "${BUILDDIR}/../${SRC}.sign" "${BUILDDIR}/../$SRC"
+# mv "${BUILDDIR}/../${SRC}.sign" "${BUILDDIR}/../$SRC"
+# fi
done
for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index f24c99b36..f1c4fd9d3 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -24,6 +24,8 @@ cat Translation-de | xz --format=lzma > Translation-de.lzma
cat Translation-de | xz > Translation-de.xz
rm Translation-en Translation-de
cd - > /dev/null
+addtrap "chmod -R +w $PWD/rootdir/media/cdrom/dists/;"
+chmod -R -w rootdir/media/cdrom/dists
aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1
sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
new file mode 100755
index 000000000..bd68fccf6
--- /dev/null
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -0,0 +1,61 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'i386'
+
+insertpackage 'stable' 'good-pkg' 'all' '1.0'
+
+setupaptarchive
+
+changetowebserver
+ARCHIVE='http://localhost/'
+msgtest 'Initial apt-get update should work with' 'InRelease'
+aptget update -qq && msgpass || msgfail
+
+# check that the setup is correct
+testequal "good-pkg:
+ Installed: (none)
+ Candidate: 1.0
+ Version table:
+ 1.0 0
+ 500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
+
+# now exchange to the Packages file, note that this could be
+# done via MITM too
+insertpackage 'stable' 'bad-mitm' 'all' '1.0'
+
+# this builds compressed files and a new (unsigned) Release
+buildaptarchivefromfiles '+1hour'
+
+# add a space into the BEGIN PGP SIGNATURE PART/END PGP SIGNATURE part
+# to trick apt - this is still legal to gpg(v)
+sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ /g' aptarchive/dists/stable/InRelease
+
+# we append the (evil unsigned) Release file to the (good signed) InRelease
+cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease
+
+
+# ensure the update fails
+# useful for debugging to add "-o Debug::pkgAcquire::auth=true"
+msgtest 'apt-get update for should fail with the modified' 'InRelease'
+aptget update 2>&1 | grep -q 'Hash Sum mismatch' > /dev/null && msgpass || msgfail
+
+# ensure there is no package
+testequal 'Reading package lists...
+Building dependency tree...
+E: Unable to locate package bad-mitm' aptget install bad-mitm -s
+
+# and verify that its not picked up
+testequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0
+
+# and that the right one is used
+testequal "good-pkg:
+ Installed: (none)
+ Candidate: 1.0
+ Version table:
+ 1.0 0
+ 500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
index d97011914..fad5488fb 100755
--- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
+++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
@@ -26,6 +26,14 @@ MD5Sum:
2182897e0a2a0c09e760beaae117a015 2023 Packages.diff/Index
1b895931853981ad8204d2439821b999 4144 Packages.gz'; echo; cat ${RELEASE}.old;) > ${RELEASE}
done
-aptget update -qq > /dev/null 2> starts-with-unsigned.msg
-sed -i 's#File .*InRelease#File InRelease#' starts-with-unsigned.msg
-testfileequal starts-with-unsigned.msg "W: GPG error: file: unstable InRelease: File InRelease doesn't start with a clearsigned message"
+
+msgtest 'The unsigned garbage before signed block is' 'ignored'
+aptget update -qq > /dev/null 2>&1 && msgpass || msgfail
+
+ROOTDIR="$(readlink -f .)"
+testequal "Package files:
+ 100 ${ROOTDIR}/rootdir/var/lib/dpkg/status
+ release a=now
+ 500 file:${ROOTDIR}/aptarchive/ unstable/main i386 Packages
+ release a=unstable,n=unstable,c=main
+Pinned packages:" aptcache policy