summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore2
-rw-r--r--apt-inst/contrib/extracttar.cc2
-rw-r--r--apt-inst/makefile5
-rw-r--r--apt-pkg/acquire-item.cc62
-rw-r--r--apt-pkg/aptconfiguration.cc2
-rw-r--r--apt-pkg/cdrom.cc5
-rw-r--r--apt-pkg/contrib/cdromutl.cc51
-rw-r--r--apt-pkg/contrib/configuration.cc43
-rw-r--r--apt-pkg/contrib/error.h29
-rw-r--r--apt-pkg/contrib/fileutl.cc124
-rw-r--r--apt-pkg/contrib/fileutl.h8
-rw-r--r--apt-pkg/contrib/hashes.cc4
-rw-r--r--apt-pkg/contrib/macros.h (renamed from apt-pkg/contrib/system.h)16
-rw-r--r--apt-pkg/contrib/md5.cc3
-rw-r--r--apt-pkg/contrib/netrc.cc211
-rw-r--r--apt-pkg/contrib/netrc.h29
-rw-r--r--apt-pkg/contrib/sha1.cc2
-rw-r--r--apt-pkg/contrib/strutl.cc49
-rw-r--r--apt-pkg/deb/debindexfile.cc30
-rw-r--r--apt-pkg/deb/deblistparser.cc3
-rw-r--r--apt-pkg/deb/dpkgpm.cc11
-rw-r--r--apt-pkg/depcache.cc8
-rw-r--r--apt-pkg/indexcopy.cc10
-rw-r--r--apt-pkg/init.cc2
-rw-r--r--apt-pkg/init.h2
-rw-r--r--apt-pkg/makefile10
-rw-r--r--apt-pkg/packagemanager.cc10
-rw-r--r--apt-pkg/pkgcache.cc2
-rw-r--r--apt-pkg/pkgcachegen.cc67
-rw-r--r--apt-pkg/policy.cc37
-rw-r--r--apt-pkg/sourcelist.cc43
-rw-r--r--buildlib/configure.mak10
-rw-r--r--buildlib/library.mak14
-rw-r--r--buildlib/libversion.mak7
-rw-r--r--buildlib/po4a_manpage.mak2
-rw-r--r--buildlib/tools.m412
-rw-r--r--cmdline/acqprogress.cc2
-rw-r--r--cmdline/apt-cache.cc2
-rw-r--r--cmdline/apt-cdrom.cc71
-rw-r--r--cmdline/apt-get.cc275
-rwxr-xr-xcmdline/apt-key65
-rwxr-xr-xcmdline/apt-mark9
-rw-r--r--configure.in6
-rw-r--r--debian/NEWS2
-rw-r--r--debian/apt.conf.autoremove1
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/apt.postinst6
-rw-r--r--debian/changelog241
-rw-r--r--debian/control10
-rwxr-xr-xdebian/rules15
-rw-r--r--doc/apt-ftparchive.1.xml4
-rw-r--r--doc/apt-get.8.xml6
-rw-r--r--doc/apt-key.8.xml24
-rw-r--r--doc/apt.conf.5.xml54
-rw-r--r--doc/apt.ent32
-rw-r--r--doc/apt_preferences.5.xml7
-rw-r--r--doc/de/addendum/xml_de.add6
-rw-r--r--doc/es/addendum/xml_es.add9
-rw-r--r--doc/examples/apt-https-method-example.conf21
-rw-r--r--doc/examples/configure-index26
-rw-r--r--doc/fr/addendum/xml_fr.add7
-rw-r--r--doc/guide.sgml6
-rw-r--r--doc/ja/addendum/xml_ja.add7
-rw-r--r--doc/makefile2
-rw-r--r--doc/offline.sgml8
-rw-r--r--doc/po/apt-doc.pot914
-rw-r--r--doc/po/de.po2271
-rw-r--r--doc/po/es.po1041
-rw-r--r--doc/po/fr.po2882
-rw-r--r--doc/po/it.po943
-rw-r--r--doc/po/ja.po1056
-rw-r--r--doc/po/pl.po943
-rw-r--r--doc/po/pt_BR.po956
-rw-r--r--doc/po4a.conf39
-rw-r--r--doc/pt_BR/addendum/xml_pt_BR.add5
-rw-r--r--doc/sources.list.5.xml6
-rw-r--r--doc/xml.add5
-rw-r--r--ftparchive/writer.cc61
-rw-r--r--ftparchive/writer.h2
-rw-r--r--methods/cdrom.cc34
-rw-r--r--methods/ftp.cc5
-rw-r--r--methods/gpgv.cc102
-rw-r--r--methods/http.cc7
-rw-r--r--methods/https.cc103
-rw-r--r--methods/https.h2
-rw-r--r--po/apt-all.pot435
-rw-r--r--po/ar.po339
-rw-r--r--po/ast.po345
-rw-r--r--po/bg.po343
-rw-r--r--po/bs.po334
-rw-r--r--po/ca.po345
-rw-r--r--po/cs.po343
-rw-r--r--po/cy.po343
-rw-r--r--po/da.po342
-rw-r--r--po/de.po345
-rw-r--r--po/dz.po344
-rw-r--r--po/el.po343
-rw-r--r--po/en_GB.po343
-rw-r--r--po/es.po343
-rw-r--r--po/eu.po343
-rw-r--r--po/fi.po343
-rw-r--r--po/fr.po496
-rw-r--r--po/gl.po343
-rw-r--r--po/he.po389
-rw-r--r--po/hu.po343
-rw-r--r--po/it.po516
-rw-r--r--po/ja.po343
-rw-r--r--po/km.po344
-rw-r--r--po/ko.po343
-rw-r--r--po/ku.po344
-rw-r--r--po/lt.po344
-rw-r--r--po/mr.po343
-rw-r--r--po/nb.po343
-rw-r--r--po/ne.po344
-rw-r--r--po/nl.po343
-rw-r--r--po/nn.po343
-rw-r--r--po/pl.po345
-rw-r--r--po/pt.po343
-rw-r--r--po/pt_BR.po343
-rw-r--r--po/ro.po343
-rw-r--r--po/ru.po487
-rw-r--r--po/sk.po548
-rw-r--r--po/sl.po343
-rw-r--r--po/sv.po343
-rw-r--r--po/th.po343
-rw-r--r--po/tl.po342
-rw-r--r--po/uk.po342
-rw-r--r--po/vi.po345
-rw-r--r--po/zh_CN.po808
-rw-r--r--po/zh_TW.po343
-rw-r--r--share/debian-archive.gpgbin2280 -> 0 bytes
-rw-r--r--share/ubuntu-archive.gpgbin1724 -> 0 bytes
-rw-r--r--test/libapt/getlistoffilesindir_test.cc82
-rw-r--r--test/libapt/makefile6
-rwxr-xr-xtest/libapt/run-tests.sh50
-rw-r--r--test/versiontest.cc2
136 files changed, 16917 insertions, 13164 deletions
diff --git a/.bzrignore b/.bzrignore
index 45db3c607..ac276b3fb 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -8,6 +8,8 @@ aclocal.m4
autom4te.cache/
build/
configure
+buildlib/config.sub
+buildlib/config.guess
# generated files in the progress to build all
# apt man pages and other documentation
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 8338fd89d..3d2788aaf 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -21,7 +21,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
-#include <system.h>
+#include <apt-pkg/macros.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/apt-inst/makefile b/apt-inst/makefile
index c0ff3d886..abc8c3fd9 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -9,9 +9,12 @@ HEADER_TARGETDIRS = apt-pkg
# Bring in the default rules
include ../buildlib/defaults.mak
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak
+
# The library name
LIBRARY=apt-inst
-MAJOR=1.2
+MAJOR=1.1
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
APT_DOMAIN:=libapt-inst$(MAJOR)
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 10e80eb56..4f0abbb91 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -219,19 +219,19 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
if(TF.Step(Tags) == true)
{
- string local_sha1;
bool found = false;
DiffInfo d;
string size;
- string tmp = Tags.FindS("SHA1-Current");
+ string const tmp = Tags.FindS("SHA1-Current");
std::stringstream ss(tmp);
- ss >> ServerSha1;
+ ss >> ServerSha1 >> size;
+ unsigned long const ServerSize = atol(size.c_str());
FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
SHA1Summation SHA1;
SHA1.AddFD(fd.Fd(), fd.Size());
- local_sha1 = string(SHA1.Result());
+ string const local_sha1 = SHA1.Result();
if(local_sha1 == ServerSha1)
{
@@ -248,20 +248,56 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
std::clog << "SHA1-Current: " << ServerSha1 << std::endl;
// check the historie and see what patches we need
- string history = Tags.FindS("SHA1-History");
+ string const history = Tags.FindS("SHA1-History");
std::stringstream hist(history);
- while(hist >> d.sha1 >> size >> d.file)
+ while(hist >> d.sha1 >> size >> d.file)
{
- d.size = atoi(size.c_str());
// read until the first match is found
+ // from that point on, we probably need all diffs
if(d.sha1 == local_sha1)
found=true;
- // from that point on, we probably need all diffs
- if(found)
+ else if (found == false)
+ continue;
+
+ if(Debug)
+ std::clog << "Need to get diff: " << d.file << std::endl;
+ available_patches.push_back(d);
+ }
+
+ if (available_patches.empty() == false)
+ {
+ // patching with too many files is rather slow compared to a fast download
+ unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0);
+ if (fileLimit != 0 && fileLimit < available_patches.size())
+ {
+ if (Debug)
+ std::clog << "Need " << available_patches.size() << " diffs (Limit is " << fileLimit
+ << ") so fallback to complete download" << std::endl;
+ return false;
+ }
+
+ // see if the patches are too big
+ found = false; // it was true and it will be true again at the end
+ d = *available_patches.begin();
+ string const firstPatch = d.file;
+ unsigned long patchesSize = 0;
+ std::stringstream patches(Tags.FindS("SHA1-Patches"));
+ while(patches >> d.sha1 >> size >> d.file)
+ {
+ if (firstPatch == d.file)
+ found = true;
+ else if (found == false)
+ continue;
+
+ patchesSize += atol(size.c_str());
+ }
+ unsigned long const sizeLimit = ServerSize * _config->FindI("Acquire::PDiffs::SizeLimit", 100);
+ if (sizeLimit > 0 && (sizeLimit/100) < patchesSize)
{
- if(Debug)
- std::clog << "Need to get diff: " << d.file << std::endl;
- available_patches.push_back(d);
+ if (Debug)
+ std::clog << "Need " << patchesSize << " bytes (Limit is " << sizeLimit/100
+ << ") so fallback to complete download" << std::endl;
+ return false;
}
}
}
@@ -270,7 +306,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
if(found)
{
// queue the diffs
- string::size_type last_space = Description.rfind(" ");
+ string::size_type const last_space = Description.rfind(" ");
if(last_space != string::npos)
Description.erase(last_space, Description.size()-last_space);
new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 1ec526646..0fe84db74 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -11,7 +11,7 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/configuration.h>
-#include <system.h>
+#include <apt-pkg/macros.h>
#include <vector>
#include <string>
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 271bca409..83165c6c0 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -821,8 +821,6 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
}
}
-
-
// Unmount and finish
if (_config->FindB("APT::CDROM::NoMount",false) == false) {
log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
@@ -913,6 +911,7 @@ pkgUdevCdromDevices::Scan() /*{{{*/
pkgUdevCdromDevices::~pkgUdevCdromDevices() /*{{{*/
{
- dlclose(libudev_handle);
+ if (libudev_handle != NULL)
+ dlclose(libudev_handle);
}
/*}}}*/
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 0cf9697ac..6dce82fe1 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -64,35 +64,44 @@ bool UnmountCdrom(string Path)
{
if (IsMounted(Path) == false)
return true;
-
- int Child = ExecFork();
- // The child
- if (Child == 0)
+ for (int i=0;i<3;i++)
{
- // Make all the fds /dev/null
- for (int I = 0; I != 3; I++)
- dup2(open("/dev/null",O_RDWR),I);
+
+ int Child = ExecFork();
- if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true)
+ // The child
+ if (Child == 0)
{
- if (system(_config->Find("Acquire::cdrom::"+Path+"::UMount").c_str()) != 0)
+ // Make all the fds /dev/null
+ for (int I = 0; I != 3; I++)
+ dup2(open("/dev/null",O_RDWR),I);
+
+ if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true)
+ {
+ if (system(_config->Find("Acquire::cdrom::"+Path+"::UMount").c_str()) != 0)
+ _exit(100);
+ _exit(0);
+ }
+ else
+ {
+ const char *Args[10];
+ Args[0] = "umount";
+ Args[1] = Path.c_str();
+ Args[2] = 0;
+ execvp(Args[0],(char **)Args);
_exit(100);
- _exit(0);
+ }
}
- else
- {
- const char *Args[10];
- Args[0] = "umount";
- Args[1] = Path.c_str();
- Args[2] = 0;
- execvp(Args[0],(char **)Args);
- _exit(100);
- }
+
+ // if it can not be umounted, give it a bit more time
+ // this can happen when auto-mount magic or fs/cdrom prober attack
+ if (ExecWait(Child,"umount",true) == true)
+ return true;
+ sleep(1);
}
- // Wait for mount
- return ExecWait(Child,"umount",true);
+ return false;
}
/*}}}*/
// MountCdrom - Mount a cdrom /*{{{*/
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index ff49ce857..7588b041c 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -22,14 +22,8 @@
#include <apti18n.h>
#include <vector>
-#include <algorithm>
#include <fstream>
#include <iostream>
-
-#include <stdio.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
using namespace std;
/*}}}*/
@@ -835,39 +829,10 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
// ReadConfigDir - Read a directory of config files /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool ReadConfigDir(Configuration &Conf,const string &Dir,bool const &AsSectional,
- unsigned const &Depth)
-{
- DIR *D = opendir(Dir.c_str());
- if (D == 0)
- return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
-
- vector<string> List;
-
- for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
- {
- if (Ent->d_name[0] == '.')
- continue;
-
- // Skip bad file names ala run-parts
- const char *C = Ent->d_name;
- for (; *C != 0; C++)
- if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-')
- break;
- if (*C != 0)
- continue;
-
- // Make sure it is a file and not something else
- string File = flCombine(Dir,Ent->d_name);
- struct stat St;
- if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
- continue;
-
- List.push_back(File);
- }
- closedir(D);
-
- sort(List.begin(),List.end());
+bool ReadConfigDir(Configuration &Conf,const string &Dir,
+ bool const &AsSectional, unsigned const &Depth)
+{
+ vector<string> const List = GetListOfFilesInDir(Dir, "conf", true, true);
// Read the files
for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index d92e40e9c..90747ff7e 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -40,27 +40,15 @@
#ifndef PKGLIB_ERROR_H
#define PKGLIB_ERROR_H
+#include <apt-pkg/macros.h>
-
-#ifdef __GNUG__
-// Methods have a hidden this parameter that is visible to this attribute
-#define APT_MFORMAT1 __attribute__ ((format (printf, 2, 3)))
-#define APT_MFORMAT2 __attribute__ ((format (printf, 3, 4)))
-#else
-#define APT_MFORMAT1
-#define APT_MFORMAT2
-#endif
-
#include <string>
-#include <system.h>
-
-using std::string;
class GlobalError
{
struct Item
{
- string Text;
+ std::string Text;
bool Error;
Item *Next;
};
@@ -72,18 +60,18 @@ class GlobalError
public:
// Call to generate an error from a library call.
- bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2 __cold;
- bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2 __cold;
+ bool Errno(const char *Function,const char *Description,...) __like_printf_2 __cold;
+ bool WarningE(const char *Function,const char *Description,...) __like_printf_2 __cold;
/* A warning should be considered less severe than an error, and may be
ignored by the client. */
- bool Error(const char *Description,...) APT_MFORMAT1 __cold;
- bool Warning(const char *Description,...) APT_MFORMAT1 __cold;
+ bool Error(const char *Description,...) __like_printf_1 __cold;
+ bool Warning(const char *Description,...) __like_printf_1 __cold;
// Simple accessors
inline bool PendingError() {return PendingFlag;};
inline bool empty() {return List == 0;};
- bool PopMessage(string &Text);
+ bool PopMessage(std::string &Text);
void Discard();
// Usefull routine to dump to cerr
@@ -96,7 +84,4 @@ class GlobalError
GlobalError *_GetErrorObj();
#define _error _GetErrorObj()
-#undef APT_MFORMAT1
-#undef APT_MFORMAT2
-
#endif
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 4240d9f49..da32983f1 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -34,9 +34,11 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
+#include <dirent.h>
#include <signal.h>
#include <errno.h>
#include <set>
+#include <algorithm>
/*}}}*/
using namespace std;
@@ -195,6 +197,128 @@ bool FileExists(string File)
return true;
}
/*}}}*/
+// GetListOfFilesInDir - returns a vector of files in the given dir /*{{{*/
+// ---------------------------------------------------------------------
+/* If an extension is given only files with this extension are included
+ in the returned vector, otherwise every "normal" file is included. */
+std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
+ bool const &SortList)
+{
+ return GetListOfFilesInDir(Dir, Ext, SortList, false);
+}
+std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
+ bool const &SortList, bool const &AllowNoExt)
+{
+ std::vector<string> ext;
+ ext.reserve(2);
+ if (Ext.empty() == false)
+ ext.push_back(Ext);
+ if (AllowNoExt == true && ext.empty() == false)
+ ext.push_back("");
+ return GetListOfFilesInDir(Dir, ext, SortList);
+}
+std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
+ bool const &SortList)
+{
+ // Attention debuggers: need to be set with the environment config file!
+ bool const Debug = _config->FindB("Debug::GetListOfFilesInDir", false);
+ if (Debug == true)
+ {
+ std::clog << "Accept in " << Dir << " only files with the following " << Ext.size() << " extensions:" << std::endl;
+ if (Ext.empty() == true)
+ std::clog << "\tNO extension" << std::endl;
+ else
+ for (std::vector<string>::const_iterator e = Ext.begin();
+ e != Ext.end(); ++e)
+ std::clog << '\t' << (e->empty() == true ? "NO" : *e) << " extension" << std::endl;
+ }
+
+ std::vector<string> List;
+ DIR *D = opendir(Dir.c_str());
+ if (D == 0)
+ {
+ _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+ return List;
+ }
+
+ for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
+ {
+ // skip "hidden" files
+ if (Ent->d_name[0] == '.')
+ continue;
+
+ // check for accepted extension:
+ // no extension given -> periods are bad as hell!
+ // extensions given -> "" extension allows no extension
+ if (Ext.empty() == false)
+ {
+ string d_ext = flExtension(Ent->d_name);
+ if (d_ext == Ent->d_name) // no extension
+ {
+ if (std::find(Ext.begin(), Ext.end(), "") == Ext.end())
+ {
+ if (Debug == true)
+ std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl;
+ continue;
+ }
+ }
+ else if (std::find(Ext.begin(), Ext.end(), d_ext) == Ext.end())
+ {
+ if (Debug == true)
+ std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl;
+ continue;
+ }
+ }
+
+ // Skip bad filenames ala run-parts
+ const char *C = Ent->d_name;
+ for (; *C != 0; ++C)
+ if (isalpha(*C) == 0 && isdigit(*C) == 0
+ && *C != '_' && *C != '-') {
+ // no required extension -> dot is a bad character
+ if (*C == '.' && Ext.empty() == false)
+ continue;
+ break;
+ }
+
+ // we don't reach the end of the name -> bad character included
+ if (*C != 0)
+ {
+ if (Debug == true)
+ std::clog << "Bad file: " << Ent->d_name << " → bad character »"
+ << *C << "« in filename (period allowed: " << (Ext.empty() ? "no" : "yes") << ")" << std::endl;
+ continue;
+ }
+
+ // skip filenames which end with a period. These are never valid
+ if (*(C - 1) == '.')
+ {
+ if (Debug == true)
+ std::clog << "Bad file: " << Ent->d_name << " → Period as last character" << std::endl;
+ continue;
+ }
+
+ // Make sure it is a file and not something else
+ string const File = flCombine(Dir,Ent->d_name);
+ struct stat St;
+ if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
+ {
+ if (Debug == true)
+ std::clog << "Bad file: " << Ent->d_name << " → stat says not a good file" << std::endl;
+ continue;
+ }
+
+ if (Debug == true)
+ std::clog << "Accept file: " << Ent->d_name << " in " << Dir << std::endl;
+ List.push_back(File);
+ }
+ closedir(D);
+
+ if (SortList == true)
+ std::sort(List.begin(),List.end());
+ return List;
+}
+ /*}}}*/
// SafeGetCWD - This is a safer getcwd that returns a dynamic string /*{{{*/
// ---------------------------------------------------------------------
/* We return / on failure. */
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 73b5ea3be..85a94898c 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -23,6 +23,7 @@
#include <string>
+#include <vector>
using std::string;
@@ -81,6 +82,13 @@ bool RunScripts(const char *Cnf);
bool CopyFile(FileFd &From,FileFd &To);
int GetLock(string File,bool Errors = true);
bool FileExists(string File);
+// FIXME: next ABI-Break: merge the two method-headers
+std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
+ bool const &SortList);
+std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
+ bool const &SortList, bool const &AllowNoExt);
+std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
+ bool const &SortList);
string SafeGetCWD();
void SetCloseExec(int Fd,bool Close);
void SetNonBlock(int Fd,bool Block);
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index b43771ea7..985d89d90 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -14,9 +14,9 @@
#include <apt-pkg/hashes.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/configuration.h>
-
+#include <apt-pkg/macros.h>
+
#include <unistd.h>
-#include <system.h>
#include <string>
#include <iostream>
/*}}}*/
diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/macros.h
index f68df6265..c39caf198 100644
--- a/apt-pkg/contrib/system.h
+++ b/apt-pkg/contrib/macros.h
@@ -1,9 +1,8 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: system.h,v 1.3 1999/12/10 23:40:29 jgg Exp $
/* ######################################################################
- System Header - Usefull private definitions
+ Macros Header - Various useful macro definitions
This source is placed in the Public Domain, do with it what you will
It was originally written by Brian C. White.
@@ -11,8 +10,8 @@
##################################################################### */
/*}}}*/
// Private header
-#ifndef SYSTEM_H
-#define SYSTEM_H
+#ifndef MACROS_H
+#define MACROS_H
// MIN_VAL(SINT16) will return -0x8000 and MAX_VAL(SINT16) = 0x7FFF
#define MIN_VAL(t) (((t)(-1) > 0) ? (t)( 0) : (t)(((1L<<(sizeof(t)*8-1)) )))
@@ -77,4 +76,13 @@
#define __cold /* no cold marker */
#endif
+#ifdef __GNUG__
+// Methods have a hidden this parameter that is visible to this attribute
+ #define __like_printf_1 __attribute__ ((format (printf, 2, 3)))
+ #define __like_printf_2 __attribute__ ((format (printf, 3, 4)))
+#else
+ #define __like_printf_1 /* no like-printf */
+ #define __like_printf_2 /* no like-printf */
+#endif
+
#endif
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 2bfd70f1b..c0fa8493d 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -37,14 +37,13 @@
// Include Files /*{{{*/
#include <apt-pkg/md5.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
#include <string.h>
#include <unistd.h>
#include <netinet/in.h> // For htonl
#include <inttypes.h>
#include <config.h>
-#include <system.h>
-
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
new file mode 100644
index 000000000..d8027fc24
--- /dev/null
+++ b/apt-pkg/contrib/netrc.cc
@@ -0,0 +1,211 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: netrc.c,v 1.38 2007-11-07 09:21:35 bagder Exp $
+/* ######################################################################
+
+ netrc file parser - returns the login and password of a give host in
+ a specified netrc-type file
+
+ Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
+ placed into the Public Domain, do with it what you will.
+
+ ##################################################################### */
+ /*}}}*/
+
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#include "netrc.h"
+
+
+/* Get user and password from .netrc when given a machine name */
+
+enum {
+ NOTHING,
+ HOSTFOUND, /* the 'machine' keyword was found */
+ HOSTCOMPLETE, /* the machine name following the keyword was found too */
+ HOSTVALID, /* this is "our" machine! */
+ HOSTEND /* LAST enum */
+};
+
+/* make sure we have room for at least this size: */
+#define LOGINSIZE 64
+#define PASSWORDSIZE 64
+#define NETRC DOT_CHAR "netrc"
+
+/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
+int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+{
+ FILE *file;
+ int retcode = 1;
+ int specific_login = (login[0] != 0);
+ char *home = NULL;
+ bool netrc_alloc = false;
+ int state = NOTHING;
+
+ char state_login = 0; /* Found a login keyword */
+ char state_password = 0; /* Found a password keyword */
+ int state_our_login = false; /* With specific_login,
+ found *our* login name */
+
+ if (!netrcfile) {
+ home = getenv ("HOME"); /* portable environment reader */
+
+ if (!home) {
+ struct passwd *pw;
+ pw = getpwuid (geteuid ());
+ if(pw)
+ home = pw->pw_dir;
+ }
+
+ if (!home)
+ return -1;
+
+ asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC);
+ if(!netrcfile)
+ return -1;
+ else
+ netrc_alloc = true;
+ }
+
+ file = fopen (netrcfile, "r");
+ if(file) {
+ char *tok;
+ char *tok_buf;
+ bool done = false;
+ char netrcbuffer[256];
+
+ while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
+ tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
+ while (!done && tok) {
+ if(login[0] && password[0]) {
+ done = true;
+ break;
+ }
+
+ switch(state) {
+ case NOTHING:
+ if (!strcasecmp ("machine", tok)) {
+ /* the next tok is the machine name, this is in itself the
+ delimiter that starts the stuff entered for this machine,
+ after this we need to search for 'login' and
+ 'password'. */
+ state = HOSTFOUND;
+ }
+ break;
+ case HOSTFOUND:
+ /* extended definition of a "machine" if we have a "/"
+ we match the start of the string (host.startswith(token) */
+ if ((strchr(host, '/') && strstr(host, tok) == host) ||
+ (!strcasecmp (host, tok))) {
+ /* and yes, this is our host! */
+ state = HOSTVALID;
+ retcode = 0; /* we did find our host */
+ }
+ else
+ /* not our host */
+ state = NOTHING;
+ break;
+ case HOSTVALID:
+ /* we are now parsing sub-keywords concerning "our" host */
+ if (state_login) {
+ if (specific_login)
+ state_our_login = !strcasecmp (login, tok);
+ else
+ strncpy (login, tok, LOGINSIZE - 1);
+ state_login = 0;
+ } else if (state_password) {
+ if (state_our_login || !specific_login)
+ strncpy (password, tok, PASSWORDSIZE - 1);
+ state_password = 0;
+ } else if (!strcasecmp ("login", tok))
+ state_login = 1;
+ else if (!strcasecmp ("password", tok))
+ state_password = 1;
+ else if(!strcasecmp ("machine", tok)) {
+ /* ok, there's machine here go => */
+ state = HOSTFOUND;
+ state_our_login = false;
+ }
+ break;
+ } /* switch (state) */
+
+ tok = strtok_r (NULL, " \t\n", &tok_buf);
+ } /* while(tok) */
+ } /* while fgets() */
+
+ fclose(file);
+ }
+
+ if (netrc_alloc)
+ free(netrcfile);
+
+ return retcode;
+}
+
+void maybe_add_auth (URI &Uri, string NetRCFile)
+{
+ if (_config->FindB("Debug::Acquire::netrc", false) == true)
+ std::clog << "maybe_add_auth: " << (string)Uri
+ << " " << NetRCFile << std::endl;
+ if (Uri.Password.empty () == true || Uri.User.empty () == true)
+ {
+ if (NetRCFile.empty () == false)
+ {
+ char login[64] = "";
+ char password[64] = "";
+ char *netrcfile = strdupa (NetRCFile.c_str ());
+
+ // first check for a generic host based netrc entry
+ char *host = strdupa (Uri.Host.c_str ());
+ if (host && parsenetrc (host, login, password, netrcfile) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::netrc", false) == true)
+ std::clog << "host: " << host
+ << " user: " << login
+ << " pass-size: " << strlen(password)
+ << std::endl;
+ Uri.User = string (login);
+ Uri.Password = string (password);
+ return;
+ }
+
+ // if host did not work, try Host+Path next, this will trigger
+ // a lookup uri.startswith(host) in the netrc file parser (because
+ // of the "/"
+ char *hostpath = strdupa (string(Uri.Host+Uri.Path).c_str ());
+ if (hostpath && parsenetrc (hostpath, login, password, netrcfile) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::netrc", false) == true)
+ std::clog << "hostpath: " << hostpath
+ << " user: " << login
+ << " pass-size: " << strlen(password)
+ << std::endl;
+ Uri.User = string (login);
+ Uri.Password = string (password);
+ return;
+ }
+ }
+ }
+}
+
+#ifdef DEBUG
+int main(int argc, char* argv[])
+{
+ char login[64] = "";
+ char password[64] = "";
+
+ if(argc < 2)
+ return -1;
+
+ if(0 == parsenetrc (argv[1], login, password, argv[2])) {
+ printf("HOST: %s LOGIN: %s PASSWORD: %s\n", argv[1], login, password);
+ }
+}
+#endif
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
new file mode 100644
index 000000000..02a5eb09f
--- /dev/null
+++ b/apt-pkg/contrib/netrc.h
@@ -0,0 +1,29 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: netrc.h,v 1.11 2004/01/07 09:19:35 bagder Exp $
+/* ######################################################################
+
+ netrc file parser - returns the login and password of a give host in
+ a specified netrc-type file
+
+ Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
+ placed into the Public Domain, do with it what you will.
+
+ ##################################################################### */
+ /*}}}*/
+#ifndef NETRC_H
+#define NETRC_H
+
+#include <apt-pkg/strutl.h>
+
+#define DOT_CHAR "."
+#define DIR_CHAR "/"
+
+// Assume: password[0]=0, host[0] != 0.
+// If login[0] = 0, search for login and password within a machine section
+// in the netrc.
+// If login[0] != 0, search for password within machine and login.
+int parsenetrc (char *host, char *login, char *password, char *filename);
+
+void maybe_add_auth (URI &Uri, string NetRCFile);
+#endif
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index b70f31dc6..eae52d52f 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -31,12 +31,12 @@
// Include Files /*{{{*/
#include <apt-pkg/sha1.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
#include <config.h>
-#include <system.h>
/*}}}*/
// SHA1Transform - Alters an existing SHA-1 hash /*{{{*/
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index bed51881f..b285a9f2e 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -43,9 +43,10 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
{
iconv_t cd;
const char *inbuf;
- char *inptr, *outbuf, *outptr;
- size_t insize, outsize;
-
+ char *inptr, *outbuf;
+ size_t insize, bufsize;
+ dest->clear();
+
cd = iconv_open(codeset, "UTF-8");
if (cd == (iconv_t)(-1)) {
// Something went wrong
@@ -55,33 +56,49 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
else
perror("iconv_open");
- // Clean the destination string
- *dest = "";
-
return false;
}
- insize = outsize = orig.size();
+ insize = bufsize = orig.size();
inbuf = orig.data();
inptr = (char *)inbuf;
- outbuf = new char[insize+1];
- outptr = outbuf;
+ outbuf = new char[bufsize];
+ size_t lastError = -1;
while (insize != 0)
{
+ char *outptr = outbuf;
+ size_t outsize = bufsize;
size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize);
+ dest->append(outbuf, outptr - outbuf);
if (err == (size_t)(-1))
{
- insize--;
- outsize++;
- inptr++;
- *outptr = '?';
- outptr++;
+ switch (errno)
+ {
+ case EILSEQ:
+ insize--;
+ inptr++;
+ // replace a series of unknown multibytes with a single "?"
+ if (lastError != insize) {
+ lastError = insize - 1;
+ dest->append("?");
+ }
+ break;
+ case EINVAL:
+ insize = 0;
+ break;
+ case E2BIG:
+ if (outptr == outbuf)
+ {
+ bufsize *= 2;
+ delete[] outbuf;
+ outbuf = new char[bufsize];
+ }
+ break;
+ }
}
}
- *outptr = '\0';
- *dest = outbuf;
delete[] outbuf;
iconv_close(cd);
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 73d72c729..bb8fae7cb 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -313,9 +313,19 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
struct stat St;
if (stat(File.FileName(),&St) != 0)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "PackagesIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
return pkgCache::PkgFileIterator(Cache);
+ }
if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "PackagesIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
+ << ") or mtime (" << St.st_mtime << " <> " << File->mtime
+ << ") doesn't match for " << File.FileName() << std::endl;
return pkgCache::PkgFileIterator(Cache);
+ }
return File;
}
@@ -480,9 +490,19 @@ pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) con
struct stat St;
if (stat(File.FileName(),&St) != 0)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "TranslationIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
return pkgCache::PkgFileIterator(Cache);
+ }
if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "TranslationIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
+ << ") or mtime (" << St.st_mtime << " <> " << File->mtime
+ << ") doesn't match for " << File.FileName() << std::endl;
return pkgCache::PkgFileIterator(Cache);
+ }
return File;
}
return File;
@@ -549,9 +569,19 @@ pkgCache::PkgFileIterator debStatusIndex::FindInCache(pkgCache &Cache) const
struct stat St;
if (stat(File.FileName(),&St) != 0)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "StatusIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
return pkgCache::PkgFileIterator(Cache);
+ }
if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "StatusIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
+ << ") or mtime (" << St.st_mtime << " <> " << File->mtime
+ << ") doesn't match for " << File.FileName() << std::endl;
return pkgCache::PkgFileIterator(Cache);
+ }
return File;
}
return File;
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 1948aedf3..bfc0e762e 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -17,10 +17,9 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/crc-16.h>
#include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
#include <ctype.h>
-
-#include <system.h>
/*}}}*/
static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index adaf362fa..565f01b84 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -49,6 +49,7 @@ namespace
std::make_pair("install", N_("Installing %s")),
std::make_pair("configure", N_("Configuring %s")),
std::make_pair("remove", N_("Removing %s")),
+ std::make_pair("purge", N_("Completely removing %s")),
std::make_pair("trigproc", N_("Running post-installation trigger %s"))
};
@@ -560,15 +561,16 @@ bool pkgDPkgPM::OpenLog()
if (!logfile_name.empty())
{
term_out = fopen(logfile_name.c_str(),"a");
+ if (term_out == NULL)
+ return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str());
+
chmod(logfile_name.c_str(), 0600);
// output current time
char outstr[200];
time_t t = time(NULL);
struct tm *tmp = localtime(&t);
strftime(outstr, sizeof(outstr), "%F %T", tmp);
- fprintf(term_out, "\nLog started: ");
- fprintf(term_out, "%s", outstr);
- fprintf(term_out, "\n");
+ fprintf(term_out, "\nLog started: %s\n", outstr);
}
return true;
}
@@ -878,7 +880,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
const char *s = _("Can not write log, openpty() "
"failed (/dev/pts not mounted?)\n");
fprintf(stderr, "%s",s);
- fprintf(term_out, "%s",s);
+ if(term_out)
+ fprintf(term_out, "%s",s);
master = slave = -1;
} else {
struct termios rtt;
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index e817adb77..eeb74a434 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -193,10 +193,10 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/
Prog->OverallProgress(amt, file_size, 1,
_("Reading state information"));
}
- if(Prog != NULL)
- Prog->OverallProgress(file_size, file_size, 1,
- _("Reading state information"));
}
+ if(Prog != NULL)
+ Prog->OverallProgress(file_size, file_size, 1,
+ _("Reading state information"));
}
return true;
@@ -244,7 +244,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/
continue;
bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
if(_config->FindB("Debug::pkgAutoRemove",false))
- std::clog << "Update exisiting AutoInstall info: "
+ std::clog << "Update existing AutoInstall info: "
<< pkg.Name() << std::endl;
TFRewriteData rewrite[2];
rewrite[0].Tag = "Auto-Installed";
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 0142d7dbe..53eb11172 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -275,7 +275,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
_error->Warning("No valid records were found.");
if (NotFound + WrongSize > 10)
- _error->Warning("Alot of entries were discarded, something may be wrong.\n");
+ _error->Warning("A lot of entries were discarded, something may be wrong.\n");
return true;
@@ -527,19 +527,19 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
// (non-existing files are not considered a error)
if(!FileExists(prefix+file))
{
- _error->Warning("Skipping non-exisiting file %s", string(prefix+file).c_str());
+ _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());
return true;
}
if (!Record)
{
- _error->Warning("Can't find authentication record for: %s",file.c_str());
+ _error->Warning(_("Can't find authentication record for: %s"), file.c_str());
return false;
}
if (!Record->Hash.VerifyFile(prefix+file))
{
- _error->Warning("Hash mismatch for: %s",file.c_str());
+ _error->Warning(_("Hash mismatch for: %s"),file.c_str());
return false;
}
@@ -847,7 +847,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
_error->Warning("No valid records were found.");
if (NotFound + WrongSize > 10)
- _error->Warning("Alot of entries were discarded, something may be wrong.\n");
+ _error->Warning("A lot of entries were discarded, something may be wrong.\n");
return true;
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 15efb1a3d..d8c201b9d 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -65,10 +65,12 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
+ Cnf.Set("Dir::Etc::netrc", "auth.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+ Cnf.Set("Dir::Media::MountPath","/media/apt");
// State
Cnf.Set("Dir::Log","var/log/apt");
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index b3e4b147f..f0757f644 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -22,7 +22,7 @@
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 9
+#define APT_PKG_MINOR 8
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f71367ace..bdd49c089 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -21,10 +21,11 @@ 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/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
- contrib/cdromutl.cc contrib/crc-16.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 \
- md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
+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 sha256.h hashes.h \
+ macros.h
# Source code for the core main library
SOURCE+= pkgcache.cc version.cc depcache.cc \
@@ -53,7 +54,4 @@ HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
HEADERS := $(addprefix apt-pkg/,$(HEADERS))
-# Private header files
-HEADERS+= system.h
-
include $(LIBRARY_H)
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 08e7fc00f..db882721e 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -298,6 +298,9 @@ bool pkgPackageManager::ConfigureAll()
of it's dependents. */
bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
{
+ if (Debug == true)
+ clog << "SmartConfigure " << Pkg.Name() << endl;
+
pkgOrderList OList(&Cache);
if (DepAdd(OList,Pkg) == false)
@@ -499,6 +502,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
while (End->Type == pkgCache::Dep::PreDepends)
{
+ if (Debug == true)
+ clog << "PreDepends order for " << Pkg.Name() << std::endl;
+
// Look for possible ok targets.
SPtrArray<Version *> VList = Start.AllTargets();
bool Bad = true;
@@ -512,6 +518,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
Pkg.State() == PkgIterator::NeedsNothing)
{
Bad = false;
+ if (Debug == true)
+ clog << "Found ok package " << Pkg.Name() << endl;
continue;
}
}
@@ -527,6 +535,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
continue;
+ if (Debug == true)
+ clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
Bad = !SmartConfigure(Pkg);
}
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index d4268b31c..29c27b58e 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -27,6 +27,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/macros.h>
#include <apti18n.h>
@@ -35,7 +36,6 @@
#include <unistd.h>
#include <ctype.h>
-#include <system.h>
/*}}}*/
using std::string;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 6d103c6b6..3d1a654d1 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -22,6 +22,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/macros.h>
#include <apt-pkg/tagfile.h>
@@ -33,7 +34,6 @@
#include <unistd.h>
#include <errno.h>
#include <stdio.h>
-#include <system.h>
/*}}}*/
typedef vector<pkgIndexFile *>::iterator FileIterator;
@@ -808,16 +808,23 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
static bool CheckValidity(const string &CacheFile, FileIterator Start,
FileIterator End,MMap **OutMap = 0)
{
+ bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
// No file, certainly invalid
if (CacheFile.empty() == true || FileExists(CacheFile) == false)
+ {
+ if (Debug == true)
+ std::clog << "CacheFile doesn't exist" << std::endl;
return false;
-
+ }
+
// Map it
FileFd CacheF(CacheFile,FileFd::ReadOnly);
SPtr<MMap> Map = new MMap(CacheF,0);
pkgCache Cache(Map);
if (_error->PendingError() == true || Map->Size() == 0)
{
+ if (Debug == true)
+ std::clog << "Errors are pending or Map is empty()" << std::endl;
_error->Discard();
return false;
}
@@ -827,9 +834,15 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
SPtrArray<bool> Visited = new bool[Cache.HeaderP->PackageFileCount];
memset(Visited,0,sizeof(*Visited)*Cache.HeaderP->PackageFileCount);
for (; Start != End; Start++)
- {
+ {
+ if (Debug == true)
+ std::clog << "Checking PkgFile " << (*Start)->Describe() << ": ";
if ((*Start)->HasPackages() == false)
+ {
+ if (Debug == true)
+ std::clog << "Has NO packages" << std::endl;
continue;
+ }
if ((*Start)->Exists() == false)
{
@@ -837,23 +850,40 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
_error->WarningE("stat",_("Couldn't stat source package list %s"),
(*Start)->Describe().c_str());
#endif
+ if (Debug == true)
+ std::clog << "file doesn't exist" << std::endl;
continue;
}
// FindInCache is also expected to do an IMS check.
pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
if (File.end() == true)
+ {
+ if (Debug == true)
+ std::clog << "FindInCache returned end-Pointer" << std::endl;
return false;
+ }
Visited[File->ID] = true;
+ if (Debug == true)
+ std::clog << "with ID " << File->ID << " is valid" << std::endl;
}
for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
if (Visited[I] == false)
+ {
+ if (Debug == true)
+ std::clog << "File with ID" << I << " wasn't visited" << std::endl;
return false;
+ }
if (_error->PendingError() == true)
{
+ if (Debug == true)
+ {
+ std::clog << "Validity failed because of pending errors:" << std::endl;
+ _error->DumpErrors();
+ }
_error->Discard();
return false;
}
@@ -940,7 +970,8 @@ static bool BuildCache(pkgCacheGenerator &Gen,
bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
MMap **OutMap,bool AllowMem)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024);
+ bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
+ unsigned long const MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024);
vector<pkgIndexFile *> Files;
for (vector<metaIndex *>::const_iterator i = List.begin();
@@ -954,13 +985,13 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
Files.push_back (*j);
}
- unsigned long EndOfSource = Files.size();
+ unsigned long const EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)
return false;
// Decide if we can write to the files..
- string CacheFile = _config->FindFile("Dir::Cache::pkgcache");
- string SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
+ string const CacheFile = _config->FindFile("Dir::Cache::pkgcache");
+ string const SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
// Decide if we can write to the cache
bool Writeable = false;
@@ -969,7 +1000,9 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
else
if (SrcCacheFile.empty() == false)
Writeable = access(flNotFile(SrcCacheFile).c_str(),W_OK) == 0;
-
+ if (Debug == true)
+ std::clog << "Do we have write-access to the cache files? " << (Writeable ? "YES" : "NO") << std::endl;
+
if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
@@ -979,8 +1012,12 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true)
{
Progress.OverallProgress(1,1,1,_("Reading package lists"));
+ if (Debug == true)
+ std::clog << "pkgcache.bin is valid - no need to build anything" << std::endl;
return true;
}
+ else if (Debug == true)
+ std::clog << "pkgcache.bin is NOT valid" << std::endl;
/* At this point we know we need to reconstruct the package cache,
begin. */
@@ -994,11 +1031,15 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
Map = new DynamicMMap(*CacheF,MMap::Public,MapSize);
if (_error->PendingError() == true)
return false;
+ if (Debug == true)
+ std::clog << "Open filebased MMap" << std::endl;
}
else
{
// Just build it in memory..
Map = new DynamicMMap(0,MapSize);
+ if (Debug == true)
+ std::clog << "Open memory Map (not filebased)" << std::endl;
}
// Lets try the source cache.
@@ -1007,16 +1048,18 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
if (CheckValidity(SrcCacheFile,Files.begin(),
Files.begin()+EndOfSource) == true)
{
+ if (Debug == true)
+ std::clog << "srcpkgcache.bin is valid - populate MMap with it." << std::endl;
// Preload the map with the source cache
FileFd SCacheF(SrcCacheFile,FileFd::ReadOnly);
- unsigned long alloc = Map->RawAllocate(SCacheF.Size());
+ unsigned long const alloc = Map->RawAllocate(SCacheF.Size());
if ((alloc == 0 && _error->PendingError())
|| SCacheF.Read((unsigned char *)Map->Data() + alloc,
SCacheF.Size()) == false)
return false;
TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
-
+
// Build the status cache
pkgCacheGenerator Gen(Map.Get(),&Progress);
if (_error->PendingError() == true)
@@ -1030,6 +1073,8 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
}
else
{
+ if (Debug == true)
+ std::clog << "srcpkgcache.bin is NOT valid - rebuild" << std::endl;
TotalSize = ComputeSize(Files.begin(),Files.end());
// Build the source cache
@@ -1071,6 +1116,8 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
// FIXME: move me to a better place
Gen.FinishCache(Progress);
}
+ if (Debug == true)
+ std::clog << "Caches are ready for shipping" << std::endl;
if (_error->PendingError() == true)
return false;
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 81fdb0431..f9901bc9a 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -27,14 +27,12 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
-
+
#include <apti18n.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <algorithm>
#include <iostream>
#include <sstream>
/*}}}*/
@@ -282,36 +280,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
return true;
}
- DIR *D = opendir(Dir.c_str());
- if (D == 0)
- return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
-
- vector<string> List;
-
- for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
- {
- if (Ent->d_name[0] == '.')
- continue;
-
- // Skip bad file names ala run-parts
- const char *C = Ent->d_name;
- for (; *C != 0; C++)
- if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-')
- break;
- if (*C != 0)
- continue;
-
- // Make sure it is a file and not something else
- string File = flCombine(Dir,Ent->d_name);
- struct stat St;
- if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
- continue;
-
- List.push_back(File);
- }
- closedir(D);
-
- sort(List.begin(),List.end());
+ vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);
// Read the files
for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 6b7a299d6..a860c7eac 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -17,13 +17,6 @@
#include <apti18n.h>
#include <fstream>
-
-// CNC:2003-03-03 - This is needed for ReadDir stuff.
-#include <algorithm>
-#include <stdio.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
/*}}}*/
using namespace std;
@@ -331,41 +324,7 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const
/* */
bool pkgSourceList::ReadSourceDir(string Dir)
{
- DIR *D = opendir(Dir.c_str());
- if (D == 0)
- return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
-
- vector<string> List;
-
- for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
- {
- if (Ent->d_name[0] == '.')
- continue;
-
- // CNC:2003-12-02 Only accept .list files as valid sourceparts
- if (flExtension(Ent->d_name) != "list")
- continue;
-
- // Skip bad file names ala run-parts
- const char *C = Ent->d_name;
- for (; *C != 0; C++)
- if (isalpha(*C) == 0 && isdigit(*C) == 0
- && *C != '_' && *C != '-' && *C != '.')
- break;
- if (*C != 0)
- continue;
-
- // Make sure it is a file and not something else
- string File = flCombine(Dir,Ent->d_name);
- struct stat St;
- if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
- continue;
-
- List.push_back(File);
- }
- closedir(D);
-
- sort(List.begin(),List.end());
+ vector<string> const List = GetListOfFilesInDir(Dir, "list", true);
// Read the files
for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index d3c548ee3..310c2600c 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -15,11 +15,13 @@ BUILDDIR=build
.PHONY: startup
startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
-configure: aclocal.m4 configure.in
- # use the files provided from the system instead of carry around
- # and use (most of the time outdated) copycats
+# use the files provided from the system instead of carry around
+# and use (most of the time outdated) copycats
+buildlib/config.sub:
ln -sf /usr/share/misc/config.sub buildlib/config.sub
- ln -sf /usr/share/misc/config.guess buildlib/config.guess
+buildlib/config.guess:
+ ln -sf /usr/share/misc/config.guess buildlib/config.guess
+configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
autoconf
aclocal.m4: $(wildcard buildlib/*.m4)
diff --git a/buildlib/library.mak b/buildlib/library.mak
index 029e87463..2a4bb782a 100644
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -16,11 +16,11 @@
# See defaults.mak for information about LOCAL
# Some local definitions
-LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR)
+LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
$(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE)))))
$(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE)))))
$(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS))
-$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR)
+$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
$(LOCAL)-SLIBS := $(SLIBS)
$(LOCAL)-LIBRARY := $(LIBRARY)
@@ -29,7 +29,7 @@ include $(PODOMAIN_H)
# Install the command hooks
headers: $($(LOCAL)-HEADERS)
-library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR)
+library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
clean: clean/$(LOCAL)
veryclean: veryclean/$(LOCAL)
@@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL)
-rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so*
# Build rules for the two symlinks
-.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
-$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
+.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
+$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
ln -sf $(<F) $@
-$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
+$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
ln -sf $(<F) $@
# The binary build rule
-$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
+$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
-rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null
echo Building shared library $@
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak
index 796c956e7..26ca86ced 100644
--- a/buildlib/libversion.mak
+++ b/buildlib/libversion.mak
@@ -12,3 +12,10 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in
# The versionnumber is extracted from apt-inst/makefile - see also there.
LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
+
+# FIXME: In previous releases this lovely variable includes
+# the detected libc and libdc++ version. As this is bogus we
+# want to drop this, but this a ABI break.
+# And we don't want to do this now. So we hardcode a value here,
+# and drop it later on (hopefully as fast as possible).
+LIBEXT=-libc6.9-6
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index dfa215d29..6eec9d031 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -57,5 +57,5 @@ endif
# Debian Doc SGML Documents
SOURCE := $(wildcard *.$(LC).sgml)
-DEBIANDOC_HTML_OPTIONS=-l $(LC)
+DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8
include $(DEBIANDOC_H)
diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index d1d692331..433d5ca32 100644
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(ah_HAVE_GETCONF,
+AC_DEFUN([ah_HAVE_GETCONF],
[AC_ARG_WITH(getconf,
[ --with-getconf Enable automagical buildtime configuration],
[if test "$withval" = "yes"; then
@@ -14,7 +14,7 @@ AC_DEFUN(ah_HAVE_GETCONF,
])
dnl ah_GET_CONF(variable, value ..., [default])
-AC_DEFUN(ah_GET_GETCONF,
+AC_DEFUN([ah_GET_GETCONF],
[AC_REQUIRE([ah_HAVE_GETCONF])
if test ! -z "$GETCONF";then
old_args="[$]@"
@@ -28,7 +28,7 @@ AC_DEFUN(ah_GET_GETCONF,
eval $1="$3"
fi
])
-AC_DEFUN(ah_NUM_CPUS,
+AC_DEFUN([ah_NUM_CPUS],
[AC_MSG_CHECKING([number of cpus])
AC_ARG_WITH(cpus,
[ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)],
@@ -56,7 +56,7 @@ AC_DEFUN(ah_NUM_CPUS,
AC_MSG_RESULT([$ah_NUM_CPUS_msg])
AC_SUBST(NUM_CPUS)
])
-AC_DEFUN(ah_PROC_MULTIPLY,
+AC_DEFUN([ah_PROC_MULTIPLY],
[AC_REQUIRE([ah_NUM_CPUS])
AC_MSG_CHECKING([processor multiplier])
AC_ARG_WITH(proc-multiply,
@@ -72,7 +72,7 @@ AC_DEFUN(ah_PROC_MULTIPLY,
AC_SUBST(PROC_MULTIPLY)
])
-AC_DEFUN(ah_NUM_PROCS,
+AC_DEFUN([ah_NUM_PROCS],
[AC_REQUIRE([ah_PROC_MULTIPLY])
AC_REQUIRE([ah_NUM_CPUS])
AC_MSG_CHECKING([number of processes to run during make])
@@ -89,7 +89,7 @@ AC_DEFUN(ah_NUM_PROCS,
AC_SUBST(NUM_PROCS)
])
-AC_DEFUN(ah_GCC3DEP,[
+AC_DEFUN([ah_GCC3DEP],[
AC_MSG_CHECKING(if $CXX -MD works)
touch gcc3dep.cc
${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index b3ded4142..32e8243bf 100644
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -150,7 +150,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
if (Quiet > 0)
return true;
- enum {Long = 0,Medium,Short} Mode = Long;
+ enum {Long = 0,Medium,Short} Mode = Medium;
char Buffer[sizeof(BlankLine)];
char *End = Buffer + sizeof(Buffer);
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 275daa187..8323a740e 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1637,7 +1637,7 @@ bool Policy(CommandLine &CmdL)
if (SrcList->FindIndex(VF.File(),Indx) == false &&
_system->FindIndex(VF.File(),Indx) == false)
return _error->Error(_("Cache is out of sync, can't x-ref a package file"));
- printf(_(" %4i %s\n"),Plcy.GetPriority(VF.File()),
+ printf(" %4i %s\n",Plcy.GetPriority(VF.File()),
Indx->Describe(true).c_str());
}
}
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index d804c55e5..0c9aab28c 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -98,6 +98,42 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
return &Progress;
};
/*}}}*/
+// SetupAutoDetect /*{{{*/
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
+{
+ bool Debug = _config->FindB("Debug::Acquire::cdrom", false);
+
+ vector<struct CdromDevice> v = UdevCdroms.Scan();
+ if (i >= v.size())
+ return false;
+
+ if (Debug)
+ clog << "Looking at devce " << i
+ << " DeviveName: " << v[i].DeviceName
+ << " IsMounted: '" << v[i].Mounted << "'"
+ << " MountPoint: '" << v[i].MountPath << "'"
+ << endl;
+
+ if (v[i].Mounted)
+ {
+ // set the right options
+ _config->Set("Acquire::cdrom::mount", v[i].MountPath);
+ _config->Set("APT::CDROM::NoMount", true);
+ } else {
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint.c_str(), 0750);
+ if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
+ _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
+ _config->Set("Acquire::cdrom::mount", AptMountPoint);
+ _config->Set("APT::CDROM::NoMount", true);
+ }
+ i++;
+
+ return true;
+}
+ /*}}}*/
+
// DoAdd - Add a new CDROM /*{{{*/
// ---------------------------------------------------------------------
/* This does the main add bit.. We show some status and things. The
@@ -106,12 +142,25 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
verify them. Then rewrite the database files */
bool DoAdd(CommandLine &)
{
- bool res = false;
+ pkgUdevCdromDevices UdevCdroms;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- res = cdrom.Add(&log);
+ bool res = true;
+
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ unsigned int count = 0;
+
+ if (AutoDetect && UdevCdroms.Dlopen())
+ {
+ while (AutoDetectCdrom(UdevCdroms, count))
+ res &= cdrom.Add(&log);
+ } else {
+ res = cdrom.Add(&log);
+ }
+
if(res)
cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
+
return res;
}
/*}}}*/
@@ -120,10 +169,24 @@ bool DoAdd(CommandLine &)
/* */
bool DoIdent(CommandLine &)
{
+ pkgUdevCdromDevices UdevCdroms;
string ident;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- return cdrom.Ident(ident, &log);
+ bool res = true;
+
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ unsigned int count = 0;
+
+ if (AutoDetect && UdevCdroms.Dlopen())
+ {
+ while (AutoDetectCdrom(UdevCdroms, count))
+ res &= cdrom.Ident(ident, &log);
+ } else {
+ return cdrom.Ident(ident, &log);
+ }
+
+ return res;
}
/*}}}*/
// ShowHelp - Show the help screen /*{{{*/
@@ -154,6 +217,7 @@ int ShowHelp()
" -m No mounting\n"
" -f Fast mode, don't check package files\n"
" -a Thorough scan mode\n"
+ " --auto-detect Auto detect drive and mount point\n"
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See fstab(5)\n";
@@ -164,6 +228,7 @@ int main(int argc,const char *argv[]) /*{{{*/
{
CommandLine::Args Args[] = {
{'h',"help","help",0},
+ { 0,"auto-detect","Acquire::cdrom::AutoDetect",0},
{'v',"version","version",0},
{'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg},
{'r',"rename","APT::CDROM::Rename",0},
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 343226bc3..5ef5533e2 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1269,131 +1269,153 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
pkgSrcRecords &SrcRecs,string &Src,
pkgDepCache &Cache)
{
- string VerTag;
- string DefRel = _config->Find("APT::Default-Release");
- string TmpSrc = Name;
- const size_t found = TmpSrc.find_last_of("/=");
-
- // extract the version/release from the pkgname
- if (found != string::npos) {
- if (TmpSrc[found] == '/')
- DefRel = TmpSrc.substr(found+1);
- else
- VerTag = TmpSrc.substr(found+1);
- TmpSrc = TmpSrc.substr(0,found);
- }
-
- /* Lookup the version of the package we would install if we were to
- install a version and determine the source package name, then look
- in the archive for a source package of the same name. */
- bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
- const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
- if (MatchSrcOnly == false && Pkg.end() == false) {
- if(VerTag.empty() == false || DefRel.empty() == false) {
- // we have a default release, try to locate the pkg. we do it like
- // this because GetCandidateVer() will not "downgrade", that means
- // "apt-get source -t stable apt" won't work on a unstable system
- for (pkgCache::VerIterator Ver = Pkg.VersionList();
- Ver.end() == false; Ver++) {
- for (pkgCache::VerFileIterator VF = Ver.FileList();
- VF.end() == false; VF++) {
- /* If this is the status file, and the current version is not the
- version in the status file (ie it is not installed, or somesuch)
- then it is not a candidate for installation, ever. This weeds
- out bogus entries that may be due to config-file states, or
- other. */
- if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
- pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
- continue;
-
- // We match against a concrete version (or a part of this version)
- if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
- continue;
-
- // or we match against a release
- if(VerTag.empty() == false ||
- (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
- (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) {
- pkgRecords::Parser &Parse = Recs.Lookup(VF);
- Src = Parse.SourcePkg();
- if (VerTag.empty() == true)
- VerTag = Parse.SourceVer();
- break;
- }
- }
- }
- if (Src.empty() == true) {
- if (VerTag.empty() == false)
- _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
- else
- _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
- VerTag.clear();
- DefRel.clear();
- }
- }
- if (VerTag.empty() == true && DefRel.empty() == true) {
- // if we don't have a version or default release, use the CandidateVer to find the Source
- pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
- if (Ver.end() == false) {
- pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
- Src = Parse.SourcePkg();
- VerTag = Parse.SourceVer();
- }
- }
- }
-
- if (Src.empty() == true)
- Src = TmpSrc;
- else {
- /* if we have a source pkg name, make sure to only search
- for srcpkg names, otherwise apt gets confused if there
- is a binary package "pkg1" and a source package "pkg1"
- with the same name but that comes from different packages */
- MatchSrcOnly = true;
- if (Src != TmpSrc) {
- ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
- }
- }
-
- // The best hit
- pkgSrcRecords::Parser *Last = 0;
- unsigned long Offset = 0;
- string Version;
-
- /* Iterate over all of the hits, which includes the resulting
- binary packages in the search */
- pkgSrcRecords::Parser *Parse;
- while (true) {
- SrcRecs.Restart();
- while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) {
- const string Ver = Parse->Version();
-
- // Ignore all versions which doesn't fit
- if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
- continue;
-
- // Newer version or an exact match? Save the hit
- if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
- Last = Parse;
- Offset = Parse->Offset();
- Version = Ver;
- }
-
- // was the version check above an exact match? If so, we don't need to look further
- if (VerTag.empty() == false && VerTag.size() == Ver.size())
- break;
- }
- if (Last != 0 || VerTag.empty() == true)
- break;
- //if (VerTag.empty() == false && Last == 0)
- _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
- VerTag.clear();
- }
-
- if (Last == 0 || Last->Jump(Offset) == false)
- return 0;
-
- return Last;
+ string VerTag;
+ string DefRel = _config->Find("APT::Default-Release");
+ string TmpSrc = Name;
+
+ // extract the version/release from the pkgname
+ const size_t found = TmpSrc.find_last_of("/=");
+ if (found != string::npos) {
+ if (TmpSrc[found] == '/')
+ DefRel = TmpSrc.substr(found+1);
+ else
+ VerTag = TmpSrc.substr(found+1);
+ TmpSrc = TmpSrc.substr(0,found);
+ }
+
+ /* Lookup the version of the package we would install if we were to
+ install a version and determine the source package name, then look
+ in the archive for a source package of the same name. */
+ bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+ const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+ if (MatchSrcOnly == false && Pkg.end() == false)
+ {
+ if(VerTag.empty() == false || DefRel.empty() == false)
+ {
+ // we have a default release, try to locate the pkg. we do it like
+ // this because GetCandidateVer() will not "downgrade", that means
+ // "apt-get source -t stable apt" won't work on a unstable system
+ for (pkgCache::VerIterator Ver = Pkg.VersionList();
+ Ver.end() == false; Ver++)
+ {
+ for (pkgCache::VerFileIterator VF = Ver.FileList();
+ VF.end() == false; VF++)
+ {
+ /* If this is the status file, and the current version is not the
+ version in the status file (ie it is not installed, or somesuch)
+ then it is not a candidate for installation, ever. This weeds
+ out bogus entries that may be due to config-file states, or
+ other. */
+ if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
+ pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
+ continue;
+
+ // We match against a concrete version (or a part of this version)
+ if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
+ continue;
+
+ // or we match against a release
+ if(VerTag.empty() == false ||
+ (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
+ (VF.File().Codename() != 0 && VF.File().Codename() == DefRel))
+ {
+ pkgRecords::Parser &Parse = Recs.Lookup(VF);
+ Src = Parse.SourcePkg();
+ // no SourcePkg name, so it is the "binary" name
+ if (Src.empty() == true)
+ Src = TmpSrc;
+ // no Version, so we try the Version of the SourcePkg -
+ // and after that the version of the binary package
+ if (VerTag.empty() == true)
+ VerTag = Parse.SourceVer();
+ if (VerTag.empty() == true)
+ VerTag = Ver.VerStr();
+ break;
+ }
+ }
+ if (Src.empty() == false)
+ break;
+ }
+ if (Src.empty() == true)
+ {
+ // Sources files have no codename information
+ if (VerTag.empty() == true && DefRel.empty() == false)
+ _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+ DefRel.clear();
+ }
+ }
+ if (Src.empty() == true)
+ {
+ // if we don't have found a fitting package yet so we will
+ // choose a good candidate and proceed with that.
+ // Maybe we will find a source later on with the right VerTag
+ pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
+ if (Ver.end() == false)
+ {
+ pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+ Src = Parse.SourcePkg();
+ if (VerTag.empty() == true)
+ VerTag = Parse.SourceVer();
+ }
+ }
+ }
+
+ if (Src.empty() == true)
+ Src = TmpSrc;
+ else
+ {
+ /* if we have a source pkg name, make sure to only search
+ for srcpkg names, otherwise apt gets confused if there
+ is a binary package "pkg1" and a source package "pkg1"
+ with the same name but that comes from different packages */
+ MatchSrcOnly = true;
+ if (Src != TmpSrc)
+ {
+ ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
+ }
+ }
+
+ // The best hit
+ pkgSrcRecords::Parser *Last = 0;
+ unsigned long Offset = 0;
+ string Version;
+
+ /* Iterate over all of the hits, which includes the resulting
+ binary packages in the search */
+ pkgSrcRecords::Parser *Parse;
+ while (true)
+ {
+ SrcRecs.Restart();
+ while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
+ {
+ const string Ver = Parse->Version();
+
+ // Ignore all versions which doesn't fit
+ if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
+ continue;
+
+ // Newer version or an exact match? Save the hit
+ if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
+ Last = Parse;
+ Offset = Parse->Offset();
+ Version = Ver;
+ }
+
+ // was the version check above an exact match? If so, we don't need to look further
+ if (VerTag.empty() == false && VerTag.size() == Ver.size())
+ break;
+ }
+ if (Last != 0 || VerTag.empty() == true)
+ break;
+ //if (VerTag.empty() == false && Last == 0)
+ _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+ VerTag.clear();
+ }
+
+ if (Last == 0 || Last->Jump(Offset) == false)
+ return 0;
+
+ return Last;
}
/*}}}*/
// DoUpdate - Update the package lists /*{{{*/
@@ -1776,7 +1798,8 @@ bool DoInstall(CommandLine &CmdL)
if(!Remove &&
Cache[Pkg].Install() == false &&
(Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
- _config->FindB("APT::Get::ReInstall",false) == false)
+ _config->FindB("APT::Get::ReInstall",false) == false &&
+ _config->FindB("APT::Get::Download-Only",false) == false)
{
ioprintf(c1out,_("%s set to manually installed.\n"),
Pkg.Name());
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7bb30240e..e45468fd4 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,10 +5,8 @@ unset GREP_OPTIONS
# We don't use a secret keyring, of course, but gpg panics and
# implodes if there isn't one available
-
GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
-GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-
+GPG="$GPG_CMD"
MASTER_KEYRING=""
ARCHIVE_KEYRING_URI=""
@@ -56,7 +54,14 @@ add_keys_with_verify_against_master_keyring() {
# (otherwise it does not make sense from a security POV)
net_update() {
if [ -z "$ARCHIVE_KEYRING_URI" ]; then
- echo "ERROR: no location for the archive-keyring given"
+ echo "ERROR: no location for the archive-keyring given"
+ exit 1
+ fi
+ # in theory we would need to depend on wget for this, but this feature
+ # isn't useable in debian anyway as we have no keyring uri nor a master key
+ if ! which wget >/dev/null 2>&1; then
+ echo "ERROR: an installed wget is required for a network-based update"
+ exit 1
fi
if [ ! -d /var/lib/apt/keyrings ]; then
mkdir -p /var/lib/apt/keyrings
@@ -93,18 +98,22 @@ update() {
# add any security. we *need* this check on net-update though
$GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
- # remove no-longer supported/used keys
- keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
- for key in $keys; do
- if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
- $GPG --quiet --batch --delete-key --yes ${key}
- fi
- done
+ if [ -r "$REMOVED_KEYS" ]; then
+ # remove no-longer supported/used keys
+ keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
+ for key in $keys; do
+ if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
+ $GPG --quiet --batch --delete-key --yes ${key}
+ fi
+ done
+ else
+ echo "Warning: removed keys keyring $REMOVED_KEYS missing or not readable" >&2
+ fi
}
usage() {
- echo "Usage: apt-key [command] [arguments]"
+ echo "Usage: apt-key [--keyring file] [command] [arguments]"
echo
echo "Manage apt's list of trusted keys"
echo
@@ -118,8 +127,40 @@ usage() {
echo " apt-key finger - list fingerprints"
echo " apt-key adv - pass advanced options to gpg (download key)"
echo
+ echo "If no specific keyring file is given the command applies to all keyring files."
}
+# Determine on which keyring we want to work
+if [ "$1" = "--keyring" ]; then
+ #echo "keyfile given"
+ shift
+ TRUSTEDFILE="$1"
+ if [ -r "$TRUSTEDFILE" ]; then
+ GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
+ else
+ echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable"
+ exit 1
+ fi
+ shift
+# otherwise use the default
+else
+ #echo "generate list"
+ TRUSTEDFILE="/etc/apt/trusted.gpg"
+ if [ -r "$TRUSTEDFILE" ]; then
+ GPG="$GPG --keyring $TRUSTEDFILE"
+ fi
+ GPG="$GPG --primary-keyring $TRUSTEDFILE"
+ TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
+ if [ -d "$TRUSTEDPARTS" ]; then
+ #echo "parts active"
+ for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do
+ #echo "part -> $trusted"
+ GPG="$GPG --keyring $trusted"
+ done
+ fi
+fi
+#echo "COMMAND: $GPG"
+
command="$1"
if [ -z "$command" ]; then
usage
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 3a818a3db..2326ece38 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -46,11 +46,16 @@ def mark_unmark_automatic(filename, action, pkgs):
print "changing %s to %s" % (pkgname,action)
newsec = apt_pkg.RewriteSection(tagfile.Section,
[],
- [ ("Auto-Installed",str(action)) ]
- )
+ [ ("Auto-Installed",str(action)) ])
+ pkgs.remove(pkgname)
outfile.write(newsec+"\n")
else:
outfile.write(str(tagfile.Section)+"\n")
+ if action == 1:
+ for pkgname in pkgs:
+ if options.verbose:
+ print "changing %s to %s" % (pkgname,action)
+ outfile.write("Package: %s\nAuto-Installed: %d\n\n" % (pkgname, action))
# all done, rename the tmpfile
os.chmod(outfile.name, 0644)
os.rename(outfile.name, STATE_FILE)
diff --git a/configure.in b/configure.in
index fe30d4ca1..302d88d51 100644
--- a/configure.in
+++ b/configure.in
@@ -96,10 +96,10 @@ AC_MSG_RESULT($archset)
AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset")
dnl We use C99 types if at all possible
-AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
+AC_CACHE_CHECK([for C99 integer types],apt_cv_c9x_ints,[
AC_TRY_COMPILE([#include <inttypes.h>],
[uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;],
- c9x_ints=yes,c9x_ints=no)])
+ apt_cv_c9x_ints=yes,apt_cv_c9x_ints=no)])
dnl Single Unix Spec statvfs
AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes])
@@ -150,7 +150,7 @@ AC_C_BIGENDIAN
dnl We do not need this if we have inttypes!
HAVE_C9X=yes
-if test x"$c9x_ints" = x"no"; then
+if test x"$apt_cv_c9x_ints" = x"no"; then
AC_CHECK_SIZEOF(char,$size_char)
AC_CHECK_SIZEOF(int,$size_int)
AC_CHECK_SIZEOF(short,$size_short)
diff --git a/debian/NEWS b/debian/NEWS
index 7612adb9c..a12f1a4f8 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -2,7 +2,7 @@ apt (0.7.24) unstable; urgency=low
* Already included in the last version but now with better documentation
is the possibility to add/prefer different compression types while
- downloading archive informations, which can decrease the time needed for
+ downloading archive information, which can decrease the time needed for
update on slow machines. See apt.conf (5) manpage for details.
* APT manages his manpage translations now with po4a, thanks to Nicolas
François and Kurasawa Nozomu, who also provide the ja translation.
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 98143ce9a..b41be8397 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -4,5 +4,6 @@ APT
{
"^linux-image.*";
"^linux-restricted-modules.*";
+ "^kfreebsd-image.*";
};
};
diff --git a/debian/apt.dirs b/debian/apt.dirs
index fb6716c35..66556e453 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -5,6 +5,7 @@ etc/apt
etc/apt/apt.conf.d
etc/apt/preferences.d
etc/apt/sources.list.d
+etc/apt/trusted.gpg.d
etc/logrotate.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 88fb932df..cc0d8b1fe 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,13 +15,7 @@ set -e
case "$1" in
configure)
-
- if ! test -f /etc/apt/trusted.gpg; then
- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
- fi
-
apt-key update
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index 26b3e8c1e..a81a2abd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,153 @@
-apt (0.7.25) UNRELEASED; urgency=low
+apt (0.7.26) UNRELEASED; urgency=low
+
+ [ David Kalnischkies ]
+ * [BREAK] add possibility to download and use multiply
+ Translation files, configurable with Acquire::Translation
+ (Closes: #444222, #448216, #550564)
+ * [BREAK] merge MultiArch-ABI. We don't support MultiArch,
+ but we support the usage of the new ABI so libapt users
+ can start to prepare for MultiArch (Closes: #536029)
+ * Ignore :qualifiers after package name in build dependencies
+ for now as long we don't understand them (Closes: #558103)
+ * apt-pkg/contrib/mmap.{cc,h}:
+ - extend it to have a growable flag - unused now but maybe...
+ * apt-pkg/pkgcache.h:
+ - use long instead of short for {Ver,Desc}File size,
+ patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
+ * apt-pkg/acquire-item.cc:
+ - allow also to skip the last patch if target is reached,
+ thanks Bernhard R. Link! (Closes: #545699)
+ * ftparchive/writer.{cc,h}:
+ - add APT::FTPArchive::AlwaysStat to disable the too aggressive
+ caching if versions are build multiply times (not recommend)
+ Patch by Christoph Goehre, thanks! (Closes: #463260)
+
+ [ Ivan Masár ]
+ * Slovak translation update. Closes: #568294
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Sat, 13 Feb 2010 01:42:50 +0100
+
+apt (0.7.25.3) unstable; urgency=low
+
+ [ Christian Perrier ]
+ * Italian translation update. Closes: #567532
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/macros.h:
+ - install the header system.h with a new name to be able to use
+ it in other headers (Closes: #567662)
+ * cmdline/acqprogress.cc:
+ - Set Mode to Medium so that the correct prefix is used.
+ Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243)
+ * ftparchive/writer.cc:
+ - generate sha1 and sha256 checksums for dsc (Closes: #567343)
+ * cmdline/apt-get.cc:
+ - don't mark as manually if in download only (Closes: #468180)
+
+ -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100
+
+apt (0.7.25.2) unstable; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/contrib/cdromutl.cc:
+ - fix UnmountCdrom() fails, give it a bit more time and try
+ the umount again
+ * apt-pkg/cdrom.cc:
+ - fix crash in pkgUdevCdromDevices
+ * methods/cdrom.cc:
+ - fixes in multi cdrom setup code (closes: #549312)
+ - add new "Acquire::cdrom::AutoDetect" config that enables/disables
+ the dlopen of libudev for automatic cdrom detection. Off by default
+ currently, feedback/testing welcome
+ * cmdline/apt-cdrom.cc:
+ - add new --auto-detect option that uses libudev to figure out
+ the cdrom/mount-point
+ * cmdline/apt-mark:
+ - merge fix from Gene Cash that supports markauto for
+ packages that are not in the extended_states file yet
+ (closes: #534920)
+ * ftparchive/writer.{cc,h}:
+ - merge crash fix for apt-ftparchive on hurd, thanks to
+ Samuel Thibault for the patch (closes: #566664)
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/fileutl.cc:
+ - Fix the newly introduced method GetListOfFilesInDir to not
+ accept every file if no extension is enforced
+ (= restore old behaviour). (Closes: #565213)
+ * apt-pkg/policy.cc:
+ - accept also partfiles with "pref" file extension as valid
+ * apt-pkg/contrib/configuration.cc:
+ - accept also partfiles with "conf" file extension as valid
+ * doc/apt.conf.5.xml:
+ - reorder description and split out syntax
+ - add partfile name convention (Closes: #558348)
+ * doc/apt_preferences.conf.5.xml:
+ - describe partfile name convention also here
+ * apt-pkg/deb/dpkgpm.cc:
+ - don't segfault if term.log file can't be opened.
+ Thanks Sam Brightman for the patch! (Closes: #475770)
+ * doc/*:
+ - replace the per language addendum with a global addendum
+ - add a explanation why translations include (maybe) english
+ parts to the new global addendum (Closes: #561636)
+ * apt-pkg/contrib/strutl.cc:
+ - fix malloc asseration fail with ja_JP.eucJP locale in
+ apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)
+
+ [ Christian Perrier ]
+ * French translation update
+
+ -- Michael Vogt <mvo@debian.org> Wed, 27 Jan 2010 16:16:10 +0100
+
+apt (0.7.25.1) unstable; urgency=low
+
+ [ Christian Perrier ]
+ * French manpage translation update
+ * Russian translation update by Yuri Kozlov
+ Closes: #564171
+
+ [Chris Leick]
+ * spot & fix various typos in all manpages
+ * German manpage translation update
+
+ [ David Kalnischkies ]
+ * cmdline/apt-cache.cc:
+ - remove translatable marker from the "%4i %s\n" string
+ * buildlib/po4a_manpage.mak:
+ - instruct debiandoc to build files with utf-8 encoding
+ * buildlib/tools.m4:
+ - fix some warning from the buildtools
+ * apt-pkg/acquire-item.cc:
+ - add configuration PDiffs::Limit-options to not download
+ too many or too big patches (Closes: #554349)
+ * debian/control:
+ - let all packages depend on ${misc:Depends}
+ * share/*-archive.gpg:
+ - remove the horrible outdated files. We already depend on
+ the keyring so we don't need to ship our own version
+ * cmdline/apt-key:
+ - errors out if wget is not installed (Closes: #545754)
+ - add --keyring option as we have now possibly many
+ * methods/gpgv.cc:
+ - pass all keyrings (TrustedParts) to gpgv instead of
+ using only one trusted.gpg keyring (Closes: #304846)
+ * methods/https.cc:
+ - finally merge the rest of the patchset from Arnaud Ebalard
+ with the CRL and Issuers options, thanks! (Closes: #485963)
+ * apt-pkg/deb/debindexfile.cc, apt-pkg/pkgcachegen.cc:
+ - add debug option Debug::pkgCacheGen
+
+ [ Michael Vogt ]
+ * cmdline/apt-get.cc:
+ - merge fix for apt-get source pkg=version regression
+ (closes: #561971)
+ * po/ru.po:
+ - merged updated ru.po, thanks to Yuri Kozlov (closes: #564171)
+
+ -- Michael Vogt <mvo@debian.org> Sat, 09 Jan 2010 21:52:36 +0100
+
+apt (0.7.25) unstable; urgency=low
[ Christian Perrier ]
* Fix apt-ftparchive(1) wrt description of the "-o" option.
@@ -13,17 +162,42 @@ apt (0.7.25) UNRELEASED; urgency=low
Closes: #548571
* German translation update by Holger Wansing
Closes: #551534
- * German translation of manpages by Chris Leick
- Closes: #552606
* Italian translation update by Milo Casagrande
Closes: #555797
+ * Simplified Chinese translation update by Aron Xu
+ Closes: #558737
+ * Slovak translation update by Ivan Masár
+ Closes: #559277
+
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.cc:
+ - add output about pre-depends configuring when debug::pkgPackageManager
+ is used
+ * methods/https.cc:
+ - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
+ thanks to Brian Thomason for the patch
+ * merge lp:~mvo/apt/netrc branch, this adds support for a
+ /etc/apt/auth.conf that can be used to store username/passwords
+ in a "netrc" style file (with the extension that it supports "/"
+ in a machine definition). Based on the maemo git branch (Closes: #518473)
+ (thanks also to Jussi Hakala and Julian Andres Klode)
+ * apt-pkg/deb/dpkgpm.cc:
+ - add "purge" to list of known actions
+ * apt-pkg/init.h:
+ - add compatibility with old ABI name until the next ABI break
+ * merge segfault fix from Mario Sanchez Prada, many thanks
+ (closes: #561109)
+
+ [ Brian Murray ]
+ * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+ - typo fix (LP: #462328)
+
+ [ Loïc Minier ]
+ * cmdline/apt-key:
+ - Emit a warning if removed keys keyring is missing and skip associated
+ checks (LP: #218971)
[ David Kalnischkies ]
- * [BREAK] add possibility to download and use multiply
- Translation files, configurable with Acquire::Translation
- (Closes: #444222, #448216, #550564)
- * Ignore :qualifiers after package name in build dependencies
- for now as long we don't understand them (Closes: #558103)
* apt-pkg/packagemanager.cc:
- better debug output for ImmediateAdd with depth and why
- improve the message shown for failing immediate configuration
@@ -37,7 +211,7 @@ apt (0.7.25) UNRELEASED; urgency=low
* doc/apt-mark.8.xml:
- correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
* cmdline/apt-get.cc:
- - source should displays his final pkg pick (Closes: #249383, #550952)
+ - source should display his final pkg pick (Closes: #249383, #550952)
- source doesn't need the complete version for match (Closes: #245250)
- source ignores versions/releases if not available (Closes: #377424)
- only warn if (free) space overflows (Closes: #522238)
@@ -59,46 +233,42 @@ apt (0.7.25) UNRELEASED; urgency=low
- bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
- fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
+ * ftparchive/writer.{cc,h}:
+ - add APT::FTPArchive::LongDescription to be able to disable them
+ * apt-pkg/deb/debsrcrecords.cc:
+ - use "diff" filetype for .debian.tar.* files (Closes: #554898)
* methods/rred.cc:
- rewrite to be able to handle even big patch files
- adopt optional mmap+iovec patch from Morten Hustveit
(Closes: #463354) which should speed up a bit. Thanks!
- * apt-pkg/contrib/mmap.{cc,h}:
- - extend it to have a growable flag - unused now but maybe...
- * apt-pkg/pkgcache.h:
- - use long instead of short for {Ver,Desc}File size,
- patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
- * apt-pkg/acquire-item.cc:
- - allow also to skip the last patch if target is reached,
- thanks Bernhard R. Link! (Closes: #545699)
- * cmdline/apt-mark:
- - print an error if a new state file can't be created,
- thanks Carl Chenet! (Closes: #521289)
- - print an error and exit if python-apt is not installed,
- thanks Carl Chenet! (Closes: #521284)
* methods/http{,s}.cc
- add config setting for User-Agent to the Acquire group,
thanks Timothy J. Miller! (Closes: #355782)
- add https options which default to http ones (Closes: #557085)
- * ftparchive/writer.{cc,h}:
- - add APT::FTPArchive::LongDescription to be able to disable them
- - add APT::FTPArchive::AlwaysStat to disable the too aggressive
- caching if versions are build multiply times (not recommend)
- Patch by Christoph Goehre, thanks! (Closes: #463260)
- * ftparchive/*:
- - fix a few typos in strings, comments and manpage,
- thanks Karl Goetz! (Closes: #558757)
- * apt-pkg/deb/debsrcrecords.cc:
- - use "diff" filetype for .debian.tar.* files (Closes: #554898)
* debian/apt.cron.daily:
- check cache size even if we do nothing else otherwise, thanks
Francesco Poli for patch(s) and patience! (Closes: #459344)
+ * ftparchive/*:
+ - fix a few typos in strings, comments and manpage,
+ thanks Karl Goetz! (Closes: #558757)
+
+ [ Carl Chenet ]
+ * cmdline/apt-mark:
+ - print an error if a new state file can't be created
+ (Closes: #521289) and
+ - exit nicely if python-apt is not installed (Closes: #521284)
[ Chris Leick ]
+ * doc/de: German translation of manpages (Closes: #552606)
* doc/ various manpages:
- correct various errors, typos and oddities (Closes: #552535)
* doc/apt-secure.8.xml:
- replace literal with emphasis tags in Archive configuration
+ * doc/apt-ftparchive.1.xml:
+ - remove informalexample tag which hides the programlisting
+ * doc/apt-get.8.xml:
+ - change equivalent "for" to "to the" (purge command)
+ - clarify --fix-broken sentence about specifying packages
[ Eugene V. Lyubimkin ]
* apt-pkg/contib/strutl.h
@@ -113,13 +283,12 @@ apt (0.7.25) UNRELEASED; urgency=low
- Restrict option names to alphanumerical characters and "/-:._+".
- Deprecate #include, we have apt.conf.d nowadays which should be
sufficient.
- * methods/https.cc:
- - Add support for authentication using netrc (Closes: #518473), patch
- by Jussi Hakala <jussi.hakala@hut.fi>.
* ftparchive/apt-ftparchive.cc:
- Call setlocale() so translations are actually used.
+ * debian/apt.conf.autoremove:
+ - Add kfreebsd-image-* to the list (Closes: #558803)
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200
+ -- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100
apt (0.7.24) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 357fb3f5f..d756871d1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring
+Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
@@ -26,6 +26,7 @@ Description: Advanced front-end for dpkg
Package: apt-doc
Architecture: all
Priority: optional
+Depends: ${misc:Depends}
Replaces: apt (<< 0.5.4.9)
Section: doc
Description: Documentation for APT
@@ -35,7 +36,7 @@ Description: Documentation for APT
Package: libapt-pkg-dev
Architecture: any
Priority: optional
-Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}
+Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}
Section: libdevel
Description: Development files for APT's libapt-pkg and libapt-inst
This package contains the header files and libraries for
@@ -45,6 +46,7 @@ Description: Development files for APT's libapt-pkg and libapt-inst
Package: libapt-pkg-doc
Architecture: all
Priority: optional
+Depends: ${misc:Depends}
Section: doc
Description: Documentation for APT development
This package contains documentation for development of the APT
@@ -52,7 +54,7 @@ Description: Documentation for APT development
Package: apt-utils
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: ${libapt-inst:provides}
Replaces: apt (<< 0.5.9)
Description: APT utility programs
@@ -65,7 +67,7 @@ Description: APT utility programs
Package: apt-transport-https
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Priority: optional
Description: APT https transport
This package contains a APT https transport. It makes it possible to
diff --git a/debian/rules b/debian/rules
index f69c0cffb..37c96ef20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
include buildlib/libversion.mak
# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR)
+LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR)
+LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR)
debian/shlibs.local: apt-pkg/makefile
# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
# one for the rest of the packages. This ensures that each package gets
# the right overrides..
rm -rf $@ $@.apt $@.apt-utils
- echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt
+ echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt
- echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
- echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils
+ echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
+ echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
- echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
- echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
+ echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
+ echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
build: build/build-stamp
build-doc: build/build-doc-stamp
@@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
- cp share/debian-archive.gpg debian/$@/usr/share/$@
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
# head -n 500 ChangeLog > debian/ChangeLog
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 5d538c2c6..eb61eae51 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -350,11 +350,11 @@
<para>
When processing a <literal>Tree</literal> section <command>apt-ftparchive</command>
performs an operation similar to:
-<informalexample><programlisting>
+ <programlisting>
for i in Sections do
for j in Architectures do
Generate for DIST=scope SECTION=i ARCH=j
-</programlisting></informalexample></para>
+ </programlisting></para>
<variablelist>
<varlistentry><term>Sections</term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index d3c3772bd..3d22f262c 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -333,8 +333,8 @@
<varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
<listitem><para>Fix; attempt to correct a system with broken dependencies in
place. This option, when used with install/remove, can omit any packages
- to permit APT to deduce a likely solution. Any Package that are specified
- must completely correct the problem. The option is sometimes necessary when
+ to permit APT to deduce a likely solution. If packages are specified,
+ these have to completely correct the problem. The option is sometimes necessary when
running APT for the first time; APT itself does not allow broken package
dependencies to exist on a system. It is possible that a system's
dependency structure can be so corrupt as to require manual intervention
@@ -466,7 +466,7 @@
<varlistentry><term><option>--purge</option></term>
<listitem><para>Use purge instead of remove for anything that would be removed.
An asterisk ("*") will be displayed next to packages which are
- scheduled to be purged. <option>remove --purge</option> is equivalent for
+ scheduled to be purged. <option>remove --purge</option> is equivalent to the
<option>purge</option> command.
Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
</varlistentry>
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 7b0691b5e..8f445b7f9 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -26,7 +26,8 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>apt-key</command>
- <arg><replaceable>command</replaceable>/</arg>
+ <arg><option>--keyring <replaceable>filename</replaceable></option></arg>
+ <arg><replaceable>command</replaceable></arg>
<arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -135,11 +136,24 @@
</variablelist>
</refsect1>
+ <refsect1><title>Options</title>
+<para>Note that options need to be defined before the commands described in the previous section.</para>
+ <variablelist>
+ <varlistentry><term>--keyring <replaceable>filename</replaceable></term>
+ <listitem><para>With this option it is possible to specify a specific keyring
+ file the command should operate on. The default is that a command is executed
+ on the <filename>trusted.gpg</filename> file as well as on all parts in the
+ <filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</filename>
+ is the primary keyring which means that e.g. new keys are added to this one.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
- <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
- </varlistentry>
+
+ &file-trustedgpg;
<varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
<listitem><para>Local trust database of archive keys.</para></listitem>
@@ -153,8 +167,6 @@
<listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
</varlistentry>
-
-
</variablelist>
</refsect1>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 777630e14..c13ad4867 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -21,7 +21,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>18 September 2009</date>
+ <date>16 January 2010</date>
</refentryinfo>
<refmeta>
@@ -37,16 +37,27 @@
</refnamediv>
<refsect1><title>Description</title>
- <para><filename>apt.conf</filename> is the main configuration file for the APT suite of
- tools, all tools make use of the configuration file and a common command line
- parser to provide a uniform environment. When an APT tool starts up it will
- read the configuration specified by the <envar>APT_CONFIG</envar> environment
- variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal>
- then read the main configuration file specified by
- <literal>Dir::Etc::main</literal> then finally apply the
- command line options to override the configuration directives, possibly
- loading even more config files.</para>
-
+ <para><filename>apt.conf</filename> is the main configuration file for
+ the APT suite of tools, but by far not the only place changes to options
+ can be made. All tools therefore share the configuration files and also
+ use a common command line parser to provide a uniform environment.</para>
+ <orderedlist>
+ <para>When an APT tool starts up it will read the configuration files
+ in the following order:</para>
+ <listitem><para>the file specified by the <envar>APT_CONFIG</envar>
+ environment variable (if any)</para></listitem>
+ <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in
+ alphanumeric ascending order which have no or "<literal>conf</literal>"
+ as filename extension and which only contain alphanumeric,
+ hyphen (-), underscore (_) and period (.) characters -
+ otherwise they will be silently ignored.</para></listitem>
+ <listitem><para>the main configuration file specified by
+ <literal>Dir::Etc::main</literal></para></listitem>
+ <listitem><para>the command line options are applied to override the
+ configuration directives or to load even more configuration files.</para></listitem>
+ </orderedlist>
+ </refsect1>
+ <refsect1><title>Syntax</title>
<para>The configuration file is organized in a tree with options organized into
functional groups. Option specification is given with a double colon
notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within
@@ -166,10 +177,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker
is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle
as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible
- that APT encounters a situation in which it is unable to perform immediate configuration, error out and
- refers to this option so the user can deactivate the immediate configuration temporary to be able to perform
+ that APT encounters a situation in which it is unable to perform immediate configuration, errors out and
+ refers to this option so the user can deactivate the immediate configuration temporarily to be able to perform
an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now
- in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package
+ in real world a few times in non-stable distribution versions and was caused by wrong dependencies of the package
in question or by a system in an already broken state, so you should not blindly disable this option as
the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place.
Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to
@@ -221,7 +232,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<varlistentry><term>PDiffs</term>
<listitem><para>Try to download deltas called <literal>PDiffs</literal> for
Packages or Sources files instead of downloading whole ones. True
- by default.</para></listitem>
+ by default.</para>
+ <para>Two sub-options to limit the use of PDiffs are also available:
+ With <literal>FileLimit</literal> can be specified how many PDiff files
+ are downloaded at most to patch a file. <literal>SizeLimit</literal>
+ on the other hand is the maximum precentage of the size of all patches
+ compared to the size of the targeted file. If one of these limits is
+ exceeded the complete file is downloaded instead of the patches.
+ </para></listitem>
</varlistentry>
<varlistentry><term>Queue-Mode</term>
@@ -396,18 +414,18 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<varlistentry><term>Languages</term>
<listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded
and in which order APT tries to display the Description-Translations. APT will try to display the first
- available Description for the Language which is listed at first. Languages can be defined with their
+ available Description in the Language which is listed at first. Languages can be defined with their
short or long Languagecodes. Note that not all archives provide <filename>Translation</filename>
files for every Language - especially the long Languagecodes are rare, so please
inform you which ones are available before you set here impossible values.</para>
<para>The default list includes "environment" and "en". "<literal>environment</literal>" has a special meaning here:
- It will be replaced at runtime with the languagecodes extracted from the <literal>LC_MESSAGES</literal> enviroment variable.
+ It will be replaced at runtime with the languagecodes extracted from the <literal>LC_MESSAGES</literal> environment variable.
It will also ensure that these codes are not included twice in the list. If <literal>LC_MESSAGES</literal>
is set to "C" only the <filename>Translation-en</filename> file (if available) will be used.
To force apt to use no Translation file use the setting <literal>Acquire::Languages=none</literal>. "<literal>none</literal>"
is another special meaning code which will stop the search for a fitting <filename>Translation</filename> file.
This can be used by the system administrator to let APT know that it should download also this files without
- actually use them if not the environment specifies this languages. So the following example configuration will
+ actually use them if the environment doesn't specify this languages. So the following example configuration will
result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded,
but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en".
<programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para></listitem>
diff --git a/doc/apt.ent b/doc/apt.ent
index 0b341ec14..c23d906e2 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -353,3 +353,35 @@
Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
</varlistentry>
">
+
+<!ENTITY file-trustedgpg "
+ <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+ <listitem><para>Keyring of local trusted keys, new keys will be added here.
+ Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>
+ <listitem><para>File fragments for the trusted keys, additional keyrings can
+ be stored here (by other packages or the administrator).
+ Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
+ </varlistentry>
+">
+
+<!ENTITY translation-title "TRANSLATION">
+
+<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed
+ to the translation in the past, who is responsible now and maybe further information
+ specially related to your translation. -->
+<!ENTITY translation-holder "
+ The english translation was done by John Doe <email>john@doe.org</email> in 2009,
+ 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the
+ Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.
+">
+
+<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings
+ in a shipped manpage will maybe appear english parts. -->
+<!ENTITY translation-english "
+ Note that this translated document may contain untranslated parts.
+ This is done on purpose, to avoid losing content when the
+ translation is lagging behind the original content.
+">
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 159d61f2b..9a4791c08 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -53,6 +53,13 @@ earliest in the &sources-list; file.
The APT preferences file does not affect the choice of instance, only
the choice of version.</para>
+<para>Note that the files in the <filename>/etc/apt/preferences.d</filename>
+directory are parsed in alphanumeric ascending order and need to obey the
+following naming convention: The files have no or "<literal>pref</literal>"
+as filename extension and which only contain alphanumeric, hyphen (-),
+underscore (_) and period (.) characters - otherwise they will be silently
+ignored.</para>
+
<refsect2><title>APT's Default Priority Assignments</title>
<para>If there is no preferences file or if there is no entry in the file
diff --git a/doc/de/addendum/xml_de.add b/doc/de/addendum/xml_de.add
deleted file mode 100644
index 2332878a6..000000000
--- a/doc/de/addendum/xml_de.add
+++ /dev/null
@@ -1,6 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Ãœbersetzung</title>
- <para>Die deutsche Ãœbersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
- in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
- </refsect1>
-
diff --git a/doc/es/addendum/xml_es.add b/doc/es/addendum/xml_es.add
deleted file mode 100644
index dc2b06be0..000000000
--- a/doc/es/addendum/xml_es.add
+++ /dev/null
@@ -1,9 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Translation</title>
- <para>The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),
- Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),
- Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),
- Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)
- and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)
- under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.
- </refsect1>
diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf
index 0067171bd..cc7889044 100644
--- a/doc/examples/apt-https-method-example.conf
+++ b/doc/examples/apt-https-method-example.conf
@@ -36,6 +36,8 @@
to access its content.
- The certificate presented by both server have (as expected) a CN that
matches their respective DNS names.
+ - We have CRL available for both dom1.tld and dom2.tld PKI, and intend
+ to use them.
- It somtimes happens that we had other more generic https available
repository to our list. We want the checks to be performed against
a common list of anchors (like the one provided by ca-certificates
@@ -56,10 +58,13 @@ Acquire::https::CaInfo "/etc/ssl/certs/ca-certificates.pem";
// Use a specific anchor and associated CRL. Enforce issuer of
// server certificate using its cert.
Acquire::https::secure.dom1.tld::CaInfo "/etc/apt/certs/ca-dom1-crt.pem";
+Acquire::https::secure.dom1.tld::CrlFile "/etc/apt/certs/ca-dom1-crl.pem";
+Acquire::https::secure.dom1.tld::IssuerCert "/etc/apt/certs/secure.dom1-issuer-crt.pem";
// Like previous for anchor and CRL, but also provide our
// certificate and keys for client authentication.
Acquire::https::secure.dom2.tld::CaInfo "/etc/apt/certs/ca-dom2-crt.pem";
+Acquire::https::secure.dom2.tld::CrlFile "/etc/apt/certs/ca-dom2-crl.pem";
Acquire::https::secure.dom2.tld::SslCert "/etc/apt/certs/my-crt.pem";
Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem";
@@ -97,6 +102,22 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem";
used for the https entries in the sources.list file that use that
repository (with the same name).
+ Acquire::https[::repo.domain.tld]::CrlFile "/path/to/all/crl.pem";
+
+ Like previous knob but for passing the list of CRL files (in PEM
+ format) to be used to verify revocation status. Again, if the
+ option is defined with no specific mirror (probably makes little
+ sense), this CRL information is used for all defined https entries
+ in sources.list file. In a mirror specific context, it only applies
+ to that mirror.
+
+ Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem";
+
+ Allows to constrain the issuer of the server certificate (for all
+ https mirrors or a specific one) to a specific issuer. If the
+ server certificate has not been issued by this certificate,
+ connection fails.
+
Acquire::https[::repo.domain.tld]::Verify-Peer "true";
When authenticating the server, if the certificate verification fails
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 05826feaa..0b30a50a9 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,11 +90,6 @@ APT
TrustCDROM "false"; // consider the CDROM always trusted
};
- GPGV
- {
- TrustedKeyring "/etc/apt/trusted.gpg";
- };
-
// Some general options
Ignore-Hold "false";
Clean-Installed "true";
@@ -176,7 +171,10 @@ Acquire
Source-Symlinks "true";
PDiffs "true"; // try to get the IndexFile diffs
-
+ PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs
+ PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess
+ // 50% of the size of the original file
+
// HTTP method configuration
http
{
@@ -250,6 +248,10 @@ Acquire
cdrom
{
+ // do auto detection of the cdrom mountpoint
+ AutoDetect "true";
+
+ // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)
mount "/cdrom";
// You need the trailing slash!
@@ -309,6 +311,7 @@ Dir "/"
// Config files
Etc "etc/apt/" {
Main "apt.conf";
+ Netrc "auth.conf";
Parts "apt.conf.d/";
Preferences "preferences";
PreferencesParts "preferences.d";
@@ -316,6 +319,8 @@ Dir "/"
SourceParts "sources.list.d";
VendorList "vendors.list";
VendorParts "vendors.list.d";
+ Trusted "trusted.gpg";
+ TrustedParts "trusted.gpg.d";
};
// Locations of binaries
@@ -334,6 +339,13 @@ Dir "/"
Log "var/log/apt" {
Terminal "term.log";
};
+
+ // Media
+ Media
+ {
+ // Media AutoDetect mount path
+ MountPath "/media/apt";
+ };
};
// Things that effect the APT dselect method
@@ -391,6 +403,7 @@ Debug
pkgProblemResolver::ShowScores "false";
pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
pkgDepCache::Marker "false";
+ pkgCacheGen "false";
pkgAcquire "false";
pkgAcquire::Worker "false";
pkgAcquire::Auth "false";
@@ -407,6 +420,7 @@ Debug
Acquire::gpgv "false"; // Show the gpgv traffic
aptcdrom "false"; // Show found package files
IdentCdrom "false";
+ acquire::netrc "false"; // netrc parser
}
diff --git a/doc/fr/addendum/xml_fr.add b/doc/fr/addendum/xml_fr.add
deleted file mode 100644
index 987b5b1f5..000000000
--- a/doc/fr/addendum/xml_fr.add
+++ /dev/null
@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Traducteurs</title>
- <para>Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009),
- Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>
- </para>
- </refsect1>
-
diff --git a/doc/guide.sgml b/doc/guide.sgml
index 1b7e1d8f3..ff727f6ca 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -56,7 +56,7 @@ requires another package to be installed at the same time to work properly.
<p>
For instance, mailcrypt is an emacs extension that aids in encrypting email
-with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a
+with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
simple dependency on GPG. Also, because it is an emacs extension it has a
simple dependency on emacs, without emacs it is completely useless.
@@ -171,7 +171,7 @@ the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to
select the packages to be installed or removed and APT actually installs them.
<p>
-To enable the APT method you need to to select [A]ccess in <prgn>dselect</>
+To enable the APT method you need to select [A]ccess in <prgn>dselect</>
and then choose the APT method. You will be prompted for a set of
<em>Sources</> which are places to fetch archives from. These can be remote
Internet sites, local Debian mirrors or CDROMs. Each source can provide
@@ -239,7 +239,7 @@ prompt until you have specified all that you want.
<p>
Before starting to use <prgn>dselect</> it is necessary to update the
-available list by selecting [U]pdate from the menu. This is a super-set of
+available list by selecting [U]pdate from the menu. This is a superset of
<tt>apt-get update</> that makes the fetched information available to
<prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</>
has been run before.
diff --git a/doc/ja/addendum/xml_ja.add b/doc/ja/addendum/xml_ja.add
deleted file mode 100644
index 05d4cff3f..000000000
--- a/doc/ja/addendum/xml_ja.add
+++ /dev/null
@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>訳者</title>
- <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),
- Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
- </para>
- </refsect1>
-
diff --git a/doc/makefile b/doc/makefile
index 6fb604e4e..6e6186466 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -8,7 +8,7 @@ include ../buildlib/defaults.mak
# Debian Doc SGML Documents
SOURCE = $(wildcard *.sgml)
-DEBIANDOC_HTML_OPTIONS=-l en
+DEBIANDOC_HTML_OPTIONS=-l en.UTF-8
include $(DEBIANDOC_H)
# Do not use XMLTO, build the manpages directly with XSLTPROC
diff --git a/doc/offline.sgml b/doc/offline.sgml
index 99e260bc3..e7ede14de 100644
--- a/doc/offline.sgml
+++ b/doc/offline.sgml
@@ -50,7 +50,7 @@ no connection.
<p>
This is achieved by creatively manipulating the APT configuration file. The
-essential premis to tell APT to look on a disc for it's archive files. Note
+essential premise to tell APT to look on a disc for it's archive files. Note
that the disc should be formated with a filesystem that can handle long file
names such as ext2, fat32 or vfat.
@@ -129,7 +129,7 @@ configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>.
<p>
On the target machine the first thing to do is mount the disc and copy
<em>/var/lib/dpkg/status</em> to it. You will also need to create the directories
-outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>
+outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>.
Then take the disc to the remote machine and configure the sources.list.
On the remote machine execute the following:
@@ -141,9 +141,9 @@ On the remote machine execute the following:
[ APT fetches all the packages needed to upgrade the target machine ]
</example>
-The dist-upgrade command can be replaced with any-other standard APT commands,
+The dist-upgrade command can be replaced with any other standard APT commands,
particularly dselect-upgrade. You can even use an APT front end such as
-<em>dselect</em> However this presents a problem in communicating your
+<em>dselect</em>. However this presents a problem in communicating your
selections back to the local computer.
<p>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 5172f7f84..40ed1f589 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-28 02:08+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -758,7 +758,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" "
@@ -770,6 +770,72 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added "
+"here.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" "
+"<varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional "
+"keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item "
+"<literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, 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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe "
+"<email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+"with the\n"
+" Debian Dummy l10n Team "
+"<email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -828,7 +894,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
+#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
msgid "Description"
msgstr ""
@@ -1218,7 +1284,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1416,7 +1482,7 @@ msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1426,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1535,7 +1601,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr ""
@@ -2270,7 +2336,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to "
+"Sets the output Sources file. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
msgstr ""
@@ -2383,20 +2449,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section "
-"<command>apt-ftparchive</command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section "
+"<command>apt-ftparchive</command> performs an operation similar to: "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2723,7 +2791,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -2815,7 +2883,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr ""
@@ -3143,15 +3211,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: "
-"<literal>APT::Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with "
+"<option>-m</option> may produce an error in some situations. Configuration "
+"Item: <literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3408,7 +3476,7 @@ msgstr ""
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be "
-"purged. <option>remove --purge</option> is equivalent for "
+"purged. <option>remove --purge</option> is equivalent to the "
"<option>purge</option> command. Configuration Item: "
"<literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3628,13 +3696,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-"<arg "
+"<command>apt-key</command> <arg><option>--keyring "
+"<replaceable>filename</replaceable></option></arg> "
+"<arg><replaceable>command</replaceable></arg> <arg "
"rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3642,17 +3711,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3660,116 +3729,134 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through "
+"<filename>trusted.gpg</filename> is the primary keyring which means that "
+"e.g. new keys are added to this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -4217,7 +4304,7 @@ msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> "
"<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial "
"documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> "
-"</author> &apt-email; &apt-product; <date>18 September 2009</date>"
+"</author> &apt-email; &apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4239,18 +4326,53 @@ msgstr ""
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the "
-"<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
-"files in <literal>Dir::Etc::Parts</literal> then read the main configuration "
-"file specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4260,7 +4382,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4276,7 +4398,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4288,7 +4410,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4297,13 +4419,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in "
"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@ -4311,14 +4433,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example "
@@ -4328,7 +4450,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and "
@@ -4340,7 +4462,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will "
@@ -4350,7 +4472,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4361,7 +4483,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4378,24 +4500,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4403,12 +4525,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version "
"available. Contains release name, codename or release version. Examples: "
@@ -4417,24 +4539,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4443,12 +4565,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4464,13 +4586,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a "
"Pre-Dependency. So in theory it is possible that APT encounters a situation "
-"in which it is unable to perform immediate configuration, error out and "
+"in which it is unable to perform immediate configuration, errors out and "
"refers to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like "
"<literal>dist-upgrade</literal> is run with this option disabled it should "
@@ -4481,12 +4603,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a "
@@ -4497,87 +4619,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4587,36 +4720,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4628,7 +4761,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4642,7 +4775,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4650,7 +4783,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4662,7 +4795,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4672,7 +4805,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4680,12 +4813,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4695,7 +4828,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4717,12 +4850,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4742,7 +4875,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4752,7 +4885,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4762,7 +4895,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4772,18 +4905,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4796,12 +4929,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4809,12 +4942,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4822,7 +4955,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4834,19 +4967,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4863,13 +4996,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4884,7 +5017,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4894,17 +5027,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
"Description-Translations. APT will try to display the first available "
-"Description for the Language which is listed at first. Languages can be "
+"Description in the Language which is listed at first. Languages can be "
"defined with their short or long Languagecodes. Note that not all archives "
"provide <filename>Translation</filename> files for every Language - "
"especially the long Languagecodes are rare, so please inform you which ones "
@@ -4912,18 +5045,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
"will be replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4932,7 +5065,7 @@ msgid ""
"another special meaning code which will stop the search for a fitting "
"<filename>Translation</filename> file. This can be used by the system "
"administrator to let APT know that it should download also this files "
-"without actually use them if not the environment specifies this "
+"without actually use them if the environment doesn't specify this "
"languages. So the following example configuration will result in the order "
"\"en, de\" in an english and in \"de, en\" in a german localization. Note "
"that \"fr\" is downloaded, but not used if APT is not used in a french "
@@ -4941,7 +5074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4949,12 +5082,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4966,7 +5099,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4979,7 +5112,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4989,7 +5122,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -4997,7 +5130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5009,7 +5142,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5022,12 +5155,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5035,12 +5168,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5051,50 +5184,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
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:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
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:507
+#: apt.conf.5.xml:525
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 "
@@ -5102,17 +5235,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -5121,12 +5254,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -5136,7 +5269,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5147,36 +5280,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
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:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5191,7 +5324,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5201,7 +5334,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -5215,12 +5348,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -5232,12 +5365,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5254,12 +5387,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
@@ -5271,12 +5404,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5286,12 +5419,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by "
@@ -5303,12 +5436,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5320,7 +5453,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5334,12 +5467,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5348,12 +5481,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5364,7 +5497,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5372,7 +5505,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5380,7 +5513,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5390,110 +5523,110 @@ 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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -5501,92 +5634,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
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><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
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><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
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><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5596,12 +5729,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5619,90 +5752,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
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><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
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><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
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><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
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><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -5710,32 +5843,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5787,13 +5920,24 @@ msgid ""
"choice of instance, only the choice of version."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or "
+"\"<literal>pref</literal>\" as filename extension and which only contain "
+"alphanumeric, hyphen (-), underscore (_) and period (.) characters - "
+"otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid ""
"<command>apt-get install -t testing "
@@ -5801,13 +5945,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5824,39 +5968,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
msgid "to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -5864,7 +6008,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5872,14 +6016,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5889,19 +6033,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the "
@@ -5909,7 +6053,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5920,7 +6064,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5930,7 +6074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5942,12 +6086,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5956,7 +6100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -5966,7 +6110,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5975,7 +6119,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5985,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5993,7 +6137,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -6002,7 +6146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -6012,7 +6156,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -6020,7 +6164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -6029,7 +6173,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -6037,7 +6181,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -6046,7 +6190,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6054,7 +6198,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -6063,82 +6207,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6146,7 +6290,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6155,14 +6299,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6179,12 +6323,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6194,7 +6338,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6202,7 +6346,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -6211,12 +6355,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6224,27 +6368,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -6256,12 +6400,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6272,18 +6416,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6294,13 +6438,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6311,7 +6455,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6320,12 +6464,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6337,18 +6481,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6357,18 +6501,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6377,13 +6521,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6397,7 +6541,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6412,12 +6556,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6425,7 +6569,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6434,12 +6578,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6454,7 +6598,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6464,7 +6608,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6473,7 +6617,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6482,13 +6626,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6497,12 +6641,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -6519,7 +6663,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6530,7 +6674,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6539,13 +6683,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6557,12 +6701,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6584,7 +6728,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6599,7 +6743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6608,13 +6752,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6626,12 +6770,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6863,7 +7007,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6872,8 +7016,8 @@ msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme "
"<literal>apt-transport-<replaceable>method</replaceable></literal>. The APT "
-"team e.g. maintain also the <literal>apt-transport-https</literal> package "
-"which provides access methods for https-URIs with features similiar to the "
+"team e.g. maintains also the <literal>apt-transport-https</literal> package "
+"which provides access methods for https-URIs with features similar to the "
"http method, but other methods for using e.g. debtorrent are also available, "
"see <citerefentry> "
"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
@@ -7094,7 +7238,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7243,11 +7387,11 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to 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 "
+"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 "
@@ -7332,7 +7476,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
"update</tt> has been run before."
@@ -7812,7 +7956,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -7911,7 +8055,7 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy "
"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
"directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em> Then take the disc to the remote machine and "
+"<em>lists/partial/</em>. Then take the disc to the remote machine and "
"configure the sources.list. On the remote machine execute the following:"
msgstr ""
@@ -7929,9 +8073,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 3ec7c4a5b..f9d374a6d 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
-"PO-Revision-Date: 2009-10-28 23:51+GMT\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"PO-Revision-Date: 2009-12-31 17:41+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr "NAME"
#. type: Plain text
#: apt.8:20
msgid "apt - Advanced Package Tool"
-msgstr "apt - Fortschrittliches Paketierungswerkzeug (Advanced Package Tool)"
+msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)"
#. type: SH
#: apt.8:20
@@ -350,13 +350,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
@@ -366,7 +360,7 @@ msgid ""
msgstr ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -404,13 +398,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
@@ -420,19 +408,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
@@ -442,19 +424,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
@@ -464,7 +440,7 @@ msgid ""
msgstr ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -1060,7 +1036,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1075,6 +1051,87 @@ msgstr ""
" </varlistentry>\n"
"\">\n"
+#. type: Plain text
+#: apt.ent:362
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!ENTITY file-sourceslist \"\n"
+#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+#| " <listitem><para>Locations to fetch packages from.\n"
+#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+" <listitem><para>Orte, von denen Pakete geladen werden.\n"
+" Konfigurationselement: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+#| " <listitem><para>File fragments for locations to fetch packages from.\n"
+#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Dateifragmente für Orte, von denen Pakete geladen werden.\n"
+" Konfigurationselement: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"Ãœbersetzung\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, 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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" Die deutsche Ãœbersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n"
+" in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1161,7 +1218,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1375,13 +1432,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1584,11 +1634,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
-#, fuzzy
-#| msgid ""
-#| "Note that a package which APT knows of is not nessasarily available to "
-#| "download, installable or installed, e.g. virtual packages are also listed "
-#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1706,7 +1751,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "Optionen"
@@ -1942,14 +1987,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr "Dateien"
@@ -1960,9 +2005,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -1974,7 +2019,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2017,7 +2062,7 @@ msgid ""
"<arg>add</arg> <arg>ident</arg> </group>"
msgstr ""
"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>CDROM-Einhängepunkt</replaceable></option></"
+"<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></"
"arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
"option></arg><arg><option>-c=<replaceable>Datei</replaceable></option></"
"arg><group><arg>hinzufügen</arg><arg>Identifikation</arg></group>"
@@ -2030,7 +2075,7 @@ msgid ""
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
msgstr ""
-"<command>apt-cdrom</command> wird benutzt, um eine neue CDROM zu APTs Liste "
+"<command>apt-cdrom</command> wird benutzt, um eine neue CD-ROM zu APTs Liste "
"der verfügbaren Quellen hinzuzufügen. <command>apt-cdrom</command> kümmert "
"sich um die festgestellte Struktur des Mediums, sowie die Korrektur für "
"mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
@@ -2062,7 +2107,7 @@ msgid ""
"title."
msgstr ""
"<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste "
-"hinzuzufügen. Es wird das CDROM-Gerät aushängen, verlangen, dass ein Medium "
+"hinzuzufügen. Es wird das CD-ROM-Gerät aushängen, verlangen, dass ein Medium "
"eingelegt wird und dann mit den Einlesen und Kopieren der Indexdateien "
"fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-"
"Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
@@ -2074,7 +2119,7 @@ msgid ""
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"APT benutzt eine CDROM-ID, um nachzuverfolgen, welches Medium gerade im "
+"APT benutzt eine CD-ROM-ID, um nachzuverfolgen, welches Medium gerade im "
"Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in "
"<filename>&statedir;/cdroms.list</filename>"
@@ -2104,7 +2149,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr "Optionen"
@@ -2341,9 +2386,9 @@ msgid ""
"names, d returns directories, b returns true or false and i returns an "
"integer. Each of the returns is normalized and verified internally."
msgstr ""
-"An das Konfigurationselement kann /[fdbi] angehängt werden. f gibt "
-"Dateinamen zurück, d gibt Verzeichnisse zurück, b gibt true oder false "
-"zurück und i gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und "
+"An das Konfigurationselement kann /[fdbi] angehängt werden. »f« gibt "
+"Dateinamen zurück, »d« gibt Verzeichnisse zurück, »b« gibt true oder false "
+"zurück und »i« gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und "
"intern geprüft."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2352,7 +2397,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2426,8 +2471,8 @@ msgid ""
"XXXX</filename> and <filename>package.config.XXXX</filename>"
msgstr ""
"Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis "
-"geschrieben, das durch -t oder --tempdir (<literal>APT::ExtractTemplates::"
-"TempDir</literal>) Verzeichnis mit Dateinamen der Form <filename>package."
+"geschrieben, das durch »-t« oder »--tempdir« (<literal>APT::ExtractTemplates::"
+"TempDir</literal>) Verzeichnis mit Dateinamen der Form <filename>package. "
"template.XXXX</filename> und <filename>package.config.XXXX</filename> "
"angegeben wurde"
@@ -2443,11 +2488,6 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2469,16 +2509,12 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. "
-"August 2009</date>"
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+"<date>17. August 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
@@ -2567,9 +2603,9 @@ msgid ""
"automatically performs file-change checks and builds the desired compressed "
"output files."
msgstr ""
-"Intern kann <command>apt-ftparchive</command> von Programmdatenbänken "
+"Intern kann <command>apt-ftparchive</command> von Programmdatenbanken "
"Gebrauch machen, um die Inhalte einer .deb-Datei zwischenzuspeichern und es "
-"verlässt sich nicht auf irgendwelche externen Programme, abgesehen von "
+"verlasst sich nicht auf irgendwelche externen Programme, abgesehen von "
"&gzip;. Wenn eine vollständige Generierung erfolgt, werden automatisch "
"Dateiänderungsprüfungen durchgeführt und die gewünschten gepackten "
"Ausgabedateien erzeugt."
@@ -2587,7 +2623,7 @@ msgid ""
"emitting a package record to stdout for each. This command is approximately "
"equivalent to &dpkg-scanpackages;."
msgstr ""
-"Der packages-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er "
+"Der »packages«-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er "
"nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-"
"Dateien, wobei es für jede einen Paketdatensatz auf stdout ausgibt.Dieser "
"Befehl entspricht etwa &dpkg-scanpackages;."
@@ -2626,7 +2662,7 @@ msgid ""
"change the source override file that will be used."
msgstr ""
"Wenn eine Override-Datei angegeben ist, wird nach einer Quellen-Override-"
-"Datei mit einer .src-Dateiendung gesucht. Die Option --source-override kann "
+"Datei mit einer .src-Dateiendung gesucht. Die Option »--source-override« kann "
"benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -2766,12 +2802,6 @@ msgstr "Dir-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -3058,8 +3088,12 @@ msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
+#, fuzzy
+#| msgid ""
+#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+#| "source/Sources</filename>"
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
"Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
@@ -3203,28 +3237,37 @@ msgstr ""
"können in einem <literal>Tree</literal>-Abschnitt, sowie als drei neue "
"Variablen benutzt werden."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt "
-"<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
-
-# report, that this string is missing in man page
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "for i in Sections do \n"
+#| " for j in Architectures do\n"
+#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
msgstr ""
"for i in Abschnitte do \n"
" for j in Architekturen do\n"
" Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+#, fuzzy
+#| msgid ""
+#| "When processing a <literal>Tree</literal> section <command>apt-"
+#| "ftparchive</command> performs an operation similar to:"
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt "
+"<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
+
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
msgid "Sections"
@@ -3489,7 +3532,7 @@ msgid ""
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
"Benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung "
-"auf den generate-Befehl. Konfigurationselement: <literal>APT::FTPArchive::"
+"auf den »generate«-Befehl. Konfigurationselement: <literal>APT::FTPArchive::"
"DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3542,7 +3585,7 @@ msgstr ""
"Führt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und "
"Paketindizes mit einer Zwischenspeicherdatenbank generiert werden, dann wird "
"die Dateiliste auch extrahiert und für spätere Benutzung in der Datenbank "
-"gespeichert. Wenn der generate-Befehl benutzt wird, erlaubt diese Option "
+"gespeichert. Wenn der »generate«-Befehl benutzt wird, erlaubt diese Option "
"außerdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. "
"Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
@@ -3579,34 +3622,58 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
#, fuzzy
-#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
+#| msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
"that it is currently not possible to create these files with <command>apt-"
"ftparchive</command>."
msgstr ""
+"Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und "
+"sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit &apt-"
+"ftparchive; generierte Archiv außerdem <filename>Translation</filename>-"
+"Dateien bereitstellt. Beachten Sie, dass es derzeit nicht möglich ist, diese "
+"Dateien mit <command>apt-ftparchive</command> zu erstellen."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3616,7 +3683,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3726,7 +3793,7 @@ msgstr ""
"apt; und &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr "update"
@@ -3885,7 +3952,7 @@ msgstr ""
"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
-"Distribution oder des Archivnamens (stable, testing, unstable) ausgewählt "
+"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) ausgewählt "
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3990,15 +4057,6 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
-#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package while "
-#| "respect the default release, set with the option <literal>APT::Default-"
-#| "Release</literal>, the <option>-t</option> option or per package with "
-#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4026,7 +4084,7 @@ msgid ""
"from. If you don't do this you will properly get another (newer, older or "
"none) source version than the one you have installed or could install."
msgstr ""
-"Paketquellen werden von Programmpaket getrennt über <literal>deb-src</"
+"Paketquellen werden vom Programmpaket getrennt über <literal>deb-src</"
"literal>-Typzeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, "
"dass Sie für jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche "
"Zeile hinzufügen müssen. Wenn Sie dies nicht tun, werden Sie eine andere als "
@@ -4035,12 +4093,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
-#, fuzzy
-#| msgid ""
-#| "If the <option>--compile</option> options is specified then the package "
-#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
-#| "command>, if <option>--download-only</option> is specified then the "
-#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4150,7 +4202,7 @@ msgstr ""
"Zwischenspeicher über eine lange Zeitspanne zu betreuen, ohne dass er "
"unkontrolliert anwächst. Die Konfigurationsoption <literal>APT::Clean-"
"Installed</literal> wird installierte Pakete vor der Löschung bewahren, wenn "
-"sie auf off gesetzt ist."
+"sie auf »off« gesetzt ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:312
@@ -4165,8 +4217,8 @@ msgid ""
"are no more needed."
msgstr ""
"<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch "
-"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und und "
-"die nicht mehr benötigt werden, zu entfernen."
+"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und die "
+"nicht mehr benötigt werden, zu entfernen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:323 apt-get.8.xml:429
@@ -4202,24 +4254,36 @@ msgstr ""
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
-# s/Any Package that are specified/Any package that is specified/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:334
+#, fuzzy
+#| msgid ""
+#| "Fix; attempt to correct a system with broken dependencies in place. This "
+#| "option, when used with install/remove, can omit any packages to permit "
+#| "APT to deduce a likely solution. Any Package that are specified must "
+#| "completely correct the problem. The option is sometimes necessary when "
+#| "running APT for the first time; APT itself does not allow broken package "
+#| "dependencies to exist on a system. It is possible that a system's "
+#| "dependency structure can be so corrupt as to require manual intervention "
+#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
+#| "to eliminate some of the offending packages). Use of this option together "
+#| "with <option>-m</option> may produce an error in some situations. "
+#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"Beheben; Versucht ein System von vorhandenen beschädigten Abhängigkeiten zu "
-"korrigieren. Diese Option kann, wenn sie mit install/remove benutzt wird, "
+"korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt wird, "
"einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche Lösung "
"herzuleiten. Jedes Paket, das angegeben ist, muss das Problem vollständig "
"korrigieren. Die Option ist manchmal nötig, wenn APT zum ersten Mal "
@@ -4335,18 +4399,12 @@ msgstr ""
"(<literal>Debug::NoLocking</literal>) automatisch deaktivieren. Außerdem "
"wird eine Mitteilung angezeigt, die angibt, dass dies nur eine Simulation "
"ist, wenn die Option <literal>APT::Get::Show-User-Simulation-Note</literal> "
-"gesetzt ist (Vorgabe ist true). Weder NoLocking noch die Mitteilung werden "
+"gesetzt ist (Vorgabe ist »true«). Weder NoLocking noch die Mitteilung werden "
"ausgelöst, wenn es als root ausgeführt wird (root sollte ohne weitere "
"Warnungen von <literal>apt-get</literal> wissen, was er tut)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4558,18 +4616,24 @@ msgstr ""
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
-# s/equivalent for/equivalent to the/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:467
+#, fuzzy
+#| msgid ""
+#| "Use purge instead of remove for anything that would be removed. An "
+#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
+#| "to be purged. <option>remove --purge</option> is equivalent for "
+#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
+#| "Purge</literal>."
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
-"»remove« »purge« für alles zu entfernende benutzen. Ein Stern (»*«) wird bei "
-"Paketen angezeigt, die zum vollständigen Entfernen vorgemerkt sind. "
-"<option>remove --purge</option> entspricht dem Befehl <option>purge</"
+"»purge« anstelle von »remove« für alles zu entfernende benutzen. Ein Stern "
+"(»*«) wird bei Paketen angezeigt, die zum vollständigen Entfernen vorgemerkt "
+"sind. <option>remove --purge</option> entspricht dem Befehl <option>purge</"
"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4606,7 +4670,7 @@ msgstr ""
"<command>apt-get</command> den Inhalt von <filename>&statedir;/lists</"
"filename> automatisch verwalten, um sicherzustellen, dass veraltete Dateien "
"gelöscht werden. Nur das häufige Ändern der Quelllisten stellt den einzigen "
-"Grund zum Ausschalten der Option dar.Konfigurationselement: <literal>APT::"
+"Grund zum Ausschalten der Option dar. Konfigurationselement: <literal>APT::"
"Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4838,8 +4902,14 @@ msgstr "APT-Schlüsselverwaltungsdienstprogramm"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#| "option></arg>"
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
@@ -4848,7 +4918,7 @@ msgstr ""
"arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4860,17 +4930,17 @@ msgstr ""
"vertrauenswürdig betrachtet."
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr "Befehle"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>Dateiname</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4882,65 +4952,65 @@ msgstr ""
"Standardeingabe."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>Schlüssel-ID</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
"Einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr "export <replaceable>Schlüssel-ID</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
"Den Schlüssel <replaceable>Schlüssel-ID</replaceable> auf der "
"Standardausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr "exportall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr "Alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr "list"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr "Vertrauenswürdige Schlüssel auflisten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr "finger"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
@@ -4949,7 +5019,7 @@ msgstr ""
"öffentlichen Schlüssel herunterladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -4958,53 +5028,71 @@ msgstr ""
"aktualisieren und aus dem Schlüsselring die Archivschlüssel entfernen, die "
"nicht länger gültig sind."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+#, fuzzy
+#| msgid "add <replaceable>filename</replaceable>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>Dateiname</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
-"Schlüsselring der lokalen vertrauenswürdigen Schlüssel, neue Schlüssel "
-"werden hier hinzugefügt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr "Schlüsselring vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
"Schlüsselring entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
@@ -5111,15 +5199,11 @@ msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of manually installed "
-#| "packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
msgstr ""
-"<literal>showauto</literal> wird benutzt, um eine Liste manuell "
+"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -5266,14 +5350,6 @@ msgstr "Vertrauenswürdige Archive"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -5323,15 +5399,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5465,48 +5532,34 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
-"<literal>Create a toplevel Release file</literal>, wenn es nicht bereits "
-"existiert. Sie können dies tun, indem Sie <command>apt-ftparchive release</"
-"command> (aus apt-utils) ausführen."
+"<emphasis>Erzeugen einer Release-Datei der obersten Stufe</emphasis>, wenn "
+"sie nicht bereits existiert. Sie können dies erledigen, indem Sie "
+"<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
"o Release.gpg Release</command>."
msgstr ""
-"<literal>Sign it</literal>. Sie können dies tun, indem Sie <command>gpg -abs "
-"-o Release.gpg Release</command> ausführen."
+"<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie "
+"<command>gpg -abs -o Release.gpg Release</command> ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
-"<literal>Publish the key fingerprint</literal>, derart, dass Ihre Anwender "
-"wissen, welchen Schlüssel sie importieren müssen, um die Dateien im Archiv "
-"zu authentifizieren."
+"<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit "
+"Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die "
+"Dateien im Archiv zu authentifizieren."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:175
@@ -5628,11 +5681,17 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
+#, fuzzy
+#| msgid ""
+#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
+#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
+#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
+#| "email; &apt-product; <date>18 September 2009</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von "
@@ -5658,35 +5717,54 @@ msgstr "Konfigurationsdatei für APT"
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die APT-"
-"Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und einen "
-"gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung "
-"bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der "
-"Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene "
-"Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, dann "
-"die durch <literal>Dir::Etc::main</literal> angegebene Konfigurationsdatei "
-"und übernimmt am Ende die Befehlszeilenoptionen, um Konfigurationsdirektiven "
-"zu überschreiben und möglicherweise sogar weitere Konfigurationsdateien zu "
-"laden."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
-#, fuzzy
-#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -5701,16 +5779,7 @@ msgstr ""
"das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
-#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5729,12 +5798,17 @@ msgstr ""
"literal> beginnen, werden als Kommentar betrachtet (und ignoriert), ebenso "
"wie jeglicher Text zwischen <literal>/*</literal> und <literal>*/</literal>, "
"wie bei C/C++-Kommentaren. Jede Zeile hat die Form <literal>APT::Get::Assume-"
-"Yes \"true\";</literal>. Das abschließende Semikolon wird benötigt und "
-"Klammern sind optional. Ein neuer Geltungsbereich kann mit geschweiften "
-"Klammern geöffnet werden, wie:"
+"Yes \"true\";</literal>. Das abschließende Semikolon und die "
+"Anführungszeichen werden benötigt. Der Wert muss in einer Zeile stehen und "
+"es gibt keine Möglichkeit Zeichenketten aneinander zu hängen. Er darf keine "
+"inneren Anführungszeichen enthalten. Das Verhalten des Backslashs »\\« und "
+"maskierter Zeichen innerhalb eines Wertes ist nicht festgelegt und diese "
+"sollten nicht benutzt werden. Ein Optionsname darf alphanumerische Zeichen "
+"und die Zeichen »/-:._+« enthalten. Ein neuer Geltungsbereich kann mit "
+"geschweiften Klammern geöffnet werden, wie:"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -5752,7 +5826,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5765,13 +5839,13 @@ msgstr ""
"jeweils getrennt durch ein Semikolon."
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -5781,7 +5855,7 @@ msgstr ""
"aussehen könnte."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5791,7 +5865,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal> benutzen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5807,15 +5881,7 @@ msgstr ""
"überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendants are "
-#| "erased. (Note that these lines also need to end with a semicolon.)"
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5825,7 +5891,8 @@ msgid ""
"The specified element and all its descendants are erased. (Note that these "
"lines also need to end with a semicolon.)"
msgstr ""
-"Es sind die beiden Spezialfälle <literal>#include</literal> und "
+"Es sind die beiden Spezialfälle <literal>#include</literal> (das missbilligt "
+"ist und von alternativen Implementierungen nicht unterstützt wird) und "
"<literal>#clear</literal> erlaubt: <literal>#include</literal> wird die "
"angegebene Datei einfügen außer, wenn der Dateiname mit einem Schrägstrich "
"endet, dann wird das ganze Verzeichnis eingefügt. <literal>#clear</literal> "
@@ -5834,7 +5901,7 @@ msgstr ""
"(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5850,7 +5917,7 @@ msgstr ""
"überschrieben, sondern nur bereinigt werden."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -5869,7 +5936,7 @@ msgstr ""
"Befehlszeile benutzt werden.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -5900,12 +5967,12 @@ msgstr ""
"sich APT nicht explizit darüber beklagt."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr "Die APT-Gruppe"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5914,12 +5981,12 @@ msgstr ""
"wie es die Optionen für alle Werkzeuge enthält."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr "Architecture"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5930,12 +5997,12 @@ msgstr ""
"die Architektur für die APT kompiliert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5948,12 +6015,12 @@ msgstr ""
"auch &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5962,12 +6029,12 @@ msgstr ""
"Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5982,12 +6049,43 @@ msgstr ""
"Möglichkeiten bereitstellt, um sie erneut zu installieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
+#, fuzzy
+#| msgid ""
+#| "Defaults to on which will cause APT to install essential and important "
+#| "packages as fast as possible in the install/upgrade operation. This is "
+#| "done to limit the effect of a failing &dpkg; call: If this option is "
+#| "disabled APT does treat an important package in the same way as an extra "
+#| "package: Between the unpacking of the important package A and his "
+#| "configuration can then be many other unpack or configuration calls, e.g. "
+#| "for package B which has no relation to A, but causes the dpkg call to "
+#| "fail (e.g. because maintainer script of package B generates an error) "
+#| "which results in a system state in which package A is unpacked but "
+#| "unconfigured - each package depending on A is now no longer guaranteed to "
+#| "work as their dependency on A is not longer satisfied. The immediate "
+#| "configuration marker is also applied to all dependencies which can "
+#| "generate a problem if the dependencies e.g. form a circle as a dependency "
+#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#| "it is possible that APT encounters a situation in which it is unable to "
+#| "perform immediate configuration, error out and refers to this option so "
+#| "the user can deactivate the immediate configuration temporary to be able "
+#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
+#| "here as this problem was only encountered by now in real world a few "
+#| "times in non-stable distribution versions and caused by wrong "
+#| "dependencies of the package in question or by a system in an already "
+#| "broken state, so you should not blindly disable this option as the "
+#| "mentioned scenario above is not the only problem immediate configuration "
+#| "can help to prevent in the first place. Before a big operation like "
+#| "<literal>dist-upgrade</literal> is run with this option disabled it "
+#| "should be tried to explicitly <literal>install</literal> the package APT "
+#| "is unable to configure immediately, but please make sure to report your "
+#| "problem also to your distribution and to the APT team with the buglink "
+#| "below so they can work on improving or correcting the upgrade process."
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6003,13 +6101,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -6018,14 +6116,48 @@ msgid ""
"distribution and to the APT team with the buglink below so they can work on "
"improving or correcting the upgrade process."
msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+"Standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder »important«-"
+"Pakete so schnell wie möglich in der »install«-/»upgrade«-Operation zu "
+"installieren. Dies wird getan, um den Effekt eines gescheiterterten &dpkg;-"
+"Aufrufs zu begrenzen: Wenn diese Option ausgeschaltet ist, behandelt APT ein "
+"»important«-Paket auf die gleiche Weise wie ein »extra«-Paket: Zwischen dem "
+"Entpacken des »important«-Pakets A und seiner Konfiguration können dann viele "
+"andere Entpack- oder Konfigurationsaufrufe liegen, z.B. für Paket B, das "
+"keine Beziehung zu A hat, aber den dpkg-Aufruf zum Scheitern bringt (z.B. "
+"weil das Betreuerskript von Paket B Fehler generiert), die als Ergebnis "
+"einen Systemstatus haben, in dem Paket A entpackt, aber nicht konfiguriert "
+"ist und für kein von A abhängendes Paket länger gewährleistet ist, dass es "
+"funktioniert, weil die Abhängigkeit zu A nicht länger befriedigt wird. Das "
+"unmittelbare Konfigurationskennzeichen wird außerdem auf alle Abhängigkeiten "
+"angewandt, was zu einem Problem führen könnten, falls die Abhängigkeiten z."
+"B. einen Kreis bilden, so dass eine Abhängigkeit mit der "
+"Unmittelbarmarkierung mit einer Vorabhängigkeit vergleichbar ist. So ist es "
+"theoretisch möglich, dass APT einer Situation begegnet, in der keine "
+"unmittelbare Konfiguration durchgeführt, ein Fehler ausgegeben und sich auf "
+"diese Option bezogen werden kann, so dass der Anwender die unmittelbare "
+"Konfiguration zeitweise deaktivieren kann, um in der Lage zu sein, erneut "
+"ein »install«/»upgrade« durchzuführen. Beachten Sie, dass hier das Wort "
+"»theoretisch« benutzt wird, denn dieses Problem ist bis jetzt in der Realität "
+"nur ein paar mal in unstabilen Distributionsversionen aufgetreten und wurde "
+"durch falsche Abhängigkeiten des fraglichen Pakets ausgelöst oder durch ein "
+"System in bereits kaputtem Status, so dass Sie diese Option nicht unbesehen "
+"abschalten sollten, da das oben erwähnte Szenario nicht das einzige "
+"unmittelbare Problem ist, das die Konfiguration überhaupt verhindern sollte. "
+"Bevor eine große Operation wie <literal>dist-upgrade</literal> mit dieser "
+"ausgeschalteten Option ausgeführt wird, sollte explizit versucht werden, "
+"<literal>install</literal> des Pakets durchzuführen. APT ist nicht in der "
+"Lage unmittelbar zu konfigurieren, aber stellen Sie sicher, dass Sie Ihr "
+"Problem außerdem an Ihre Distribution und an das APT-Team berichten mit "
+"nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des "
+"Upgrade-Prozesses arbeiten kann."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6043,12 +6175,12 @@ msgstr ""
"bash oder etwas, was davon abhängt, sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6058,24 +6190,24 @@ msgstr ""
"(in Bytes)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
"werde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6085,12 +6217,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6100,32 +6232,32 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
-msgstr "CDROM"
+msgstr "CD-ROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
-"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
+"Der CD-ROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
"dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
"erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6134,13 +6266,24 @@ msgstr ""
"oder Quelldateien herunterzuladen, statt der kompletten Dateien. Vorgabe ist "
"True."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6156,12 +6299,12 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6170,12 +6313,12 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6185,12 +6328,12 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6208,7 +6351,7 @@ msgstr ""
"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6234,7 +6377,7 @@ msgstr ""
"unterstützt keine dieser Optionen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6245,16 +6388,7 @@ msgstr ""
"Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6274,7 +6408,7 @@ msgstr ""
"gegen RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6290,25 +6424,24 @@ msgstr ""
"deaktiviert.)"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
"clients only if the client uses a known identifier."
msgstr ""
+"<literal>Acquire::http::User-Agent</literal> kann benutzt werden, um einen "
+"unterschiedlichen User-Agent für die HTTP-Download-Methode zu setzten, da "
+"einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
+"bekannten Bezeichner verwendet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control and proxy options are the same as for "
-#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
-#| "is not supported yet."
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6316,12 +6449,14 @@ msgid ""
"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
-"HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen "
-"der <literal>http</literal>-Methode. Die Option <literal>Pipeline-Depth</"
-"literal> wird noch nicht unterstützt."
+"HTTPS-URIs. Zwischenspeichersteuerung-, Zeitüberschreitung-, AllowRedirect-, "
+"Dl-Limit- und Proxy-Optionen entsprechen denen der <literal>http</literal>-"
+"Methode und werden auch für die Optionen der Methode <literal>http</literal> "
+"vorgegeben, falls sie nicht explizit für HTTPS gesetzt sind. Die Option "
+"<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6360,12 +6495,12 @@ msgstr ""
"SslForceVersion</literal> ist die entsprechende per-Host-Option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6400,7 +6535,7 @@ msgstr ""
"entsprechenden URI-Bestandteil genommen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6417,7 +6552,7 @@ msgstr ""
"Beispielskonfiguration, um Beispiele zu erhalten)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6431,7 +6566,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6447,19 +6582,18 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
-#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
+#: apt.conf.5.xml:374
+#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
-msgstr "\"/cdrom/\"::Mount \"foo\";"
+msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6471,22 +6605,22 @@ msgid ""
"can be specified using UMount."
msgstr ""
"CDROM-URIs; Die einzige Einstellung für CDROM-URIs ist der Einhängepunkt "
-"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CDROM-Laufwerks "
+"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks "
"sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist "
"möglich alternative Ein- und Aushängebefehle anzugeben, falls Ihr "
"Einhängepunkt nicht in der fstab aufgelistet werden kann (so wie beim "
"Einhängen per SMB und alten Mount-Paketen). Die Syntax besteht darin, "
-"<placeholder type=\"literallayout\" id=\"0\"/> in den CDROM-Block "
+"<placeholder type=\"literallayout\" id=\"0\"/> in den CD-ROM-Block "
"einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle "
"können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6497,18 +6631,18 @@ msgstr ""
"Zusätzliche Parameter werden an gpgv weitergeleitet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6528,19 +6662,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6571,13 +6705,13 @@ msgstr ""
"explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6603,7 +6737,7 @@ msgstr ""
"diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6620,36 +6754,75 @@ msgstr ""
"unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
-msgstr ""
+msgstr "Sprachen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "Description-Translations. APT will try to display the first available "
+#| "Description for the Language which is listed at first. Languages can be "
+#| "defined with their short or long Languagecodes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
+"Der Unterabschnitt Languages steuert welche <filename>Translation</filename>-"
+"Dateien heruntergeladen werden und in welcher Reihenfolge APT versucht, die "
+"Beschreibungsübersetzungen anzuzeigen. APT wird versuchen, die erste "
+"verfügbare Beschreibung für die zuerst aufgelistete Sprache anzuzeigen. "
+"Sprachen können durch ihre kurzen oder langen Sprachcodes definiert sein. "
+"Beachten Sie, dass nicht alle Archive <filename>Translation</filename>-"
+"Dateien für jede Sprache bereitstellen, besonders lange Sprachcodes sind "
+"selten. Informieren Sie sich deshalb bitte welche verfügbar sind, bevor Sie "
+"hier unmögliche Werte einsetzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
+msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used. To "
+#| "force apt to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a fitting "
+#| "<filename>Translation</filename> file. This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if not the environment specifies this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6658,16 +6831,35 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
"\"/>"
msgstr ""
+"Die Standardliste beinhaltet »environment« und »en«. »<literal>environment</"
+"literal>« hat hier eine besondere Bedeutung: Es wird zur Laufzeit durch die "
+"Sprachcodes ersetzt, die aus der Umgebungsvariable <literal>LC_MESSAGES</"
+"literal> extrahiert wurden. Es wird außerdem sicherstellen, dass diese Codes "
+"nicht zweimal in der Liste enthalten sind. Falls <literal>LC_MESSAGES</"
+"literal> auf »C« gesetzt ist, wird nur die Datei <filename>Translation-en</"
+"filename> (falls verfügbar) benutzt. Um APT zu zwingen, keine "
+"Ãœbersetzungsdatei zu benutzen, benutzen Sie die Einstellung "
+"<literal>Acquire::Languages=none</literal>. »<literal>none</literal>« ist ein "
+"weiterer Code mit besonderer Bedeutung, der die Suche nach einer passenden "
+"<filename>Translation</filename>-Datei stoppen wird. Dies kann vom "
+"Systemadministrator benutzt werden, um APT mitzuteilen, dass es auch diese "
+"Dateien herunterladen soll ohne sie aktuell zu benutzen, falls die "
+"Umgebungsvariable diese Sprachen nicht angibt. Daher wird die folgende "
+"Beispielkonfiguration in der Reihenfolge »en,de« zu einer englischen und »de,"
+"en« zu einer deutschen Lokalisierung führen. Beachten Sie, dass »fr« "
+"heruntergeladen, aber nicht benutzt wird, falls APT nicht in einer "
+"französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre die "
+"Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6677,12 +6869,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6702,7 +6894,7 @@ msgstr ""
"filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6725,7 +6917,7 @@ msgstr ""
"<literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6740,7 +6932,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -6752,7 +6944,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6770,7 +6962,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6790,12 +6982,12 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6806,12 +6998,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6820,16 +7012,16 @@ msgid ""
"for instance). pre-auto performs this action before downloading new "
"packages."
msgstr ""
-"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder always, prompt, "
-"auto, pre-auto oder never sein. always und prompt werden, nachdem das "
-"Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher entfernen, "
-"prompt (die Vorgabe) tut dies bedingt. auto entfernt nur jene Pakete, die "
-"nicht länger heruntergeladen werden können (zum Beispiel, weil sie durch "
-"eine neue Version ersetzt wurden). pre-auto führt diese Aktion vor dem "
-"Herunterladen neuer Pakete durch."
+"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder »always«, "
+"»prompt«, »auto«, »pre-auto« oder »never« sein. »always« und »prompt« werden, "
+"nachdem das Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher "
+"entfernen, »prompt« (die Vorgabe) tut dies bedingt. »auto« entfernt nur jene "
+"Pakete, die nicht länger heruntergeladen werden können (zum Beispiel, weil "
+"sie durch eine neue Version ersetzt wurden). »pre-auto« führt diese Aktion "
+"vor dem Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6838,12 +7030,12 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6852,12 +7044,12 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6866,12 +7058,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr "Wie APT Dpkg aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6880,7 +7072,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
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 "
@@ -6891,17 +7083,17 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -6915,12 +7107,12 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -6937,7 +7129,7 @@ msgstr ""
"pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6953,12 +7145,12 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6967,12 +7159,12 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6982,12 +7174,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7013,7 +7205,7 @@ msgstr ""
"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7027,7 +7219,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -7052,22 +7244,12 @@ msgstr ""
"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
-#, fuzzy
-#| msgid ""
-#| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
-#| "call). See &dpkg; if you are interested in what this actually means. In "
-#| "short: dpkg will not run the triggers then this flag is present unless it "
-#| "is explicit called to do so in an extra call. Note that this option "
-#| "exists (undocumented) also in older apt versions with a slightly "
-#| "different meaning: Previously these option only append --no-triggers to "
-#| "the configure calls to dpkg - now apt will add these flag also to the "
-#| "unpack and remove calls."
+#: apt.conf.5.xml:585
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 "
@@ -7085,29 +7267,15 @@ msgstr ""
"außerdem in älteren APT-Versionen mit einer geringfügig anderen Bedeutung "
"existiert (nicht dokumentiert): Vorher hing diese Option nur --no-triggers "
"an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung "
-"außerdem an die unpack- und remove-Aufrufe anhängen."
+"außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
-#, fuzzy
-#| msgid ""
-#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-#| "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
-#| "value and causes APT to configure all packages explicit. The "
-#| "\"<literal>smart</literal>\" way is it to configure only packages which "
-#| "need to be configured before another package can be unpacked (Pre-"
-#| "Depends) and let the rest configure by dpkg with a call generated by the "
-#| "next option. \"<literal>no</literal>\" on the other hand will not "
-#| "configure anything and totally relay on dpkg for configuration (which "
-#| "will at the moment fail if a Pre-Depends is encountered). Setting this "
-#| "option to another than the all value will implicit activate also the next "
-#| "option per default as otherwise the system could end in an unconfigured "
-#| "status which could be unbootable!"
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7136,20 +7304,12 @@ msgstr ""
"mehr startbar sein könnte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
-#, fuzzy
-#| msgid ""
-#| "If this option is set apt will call <command>dpkg --configure --pending</"
-#| "command> to let dpkg handle all required configurations and triggers. "
-#| "This option is activated automatic per default if the previous option is "
-#| "not set to <literal>all</literal>, but deactivating could be useful if "
-#| "you want to run APT multiple times in a row - e.g. in an installer. In "
-#| "this sceneries you could deactivate this option in all but the last run."
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7168,12 +7328,12 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7189,12 +7349,12 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7213,12 +7373,12 @@ msgstr ""
"und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7236,7 +7396,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7260,12 +7420,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7279,12 +7439,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7302,7 +7462,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7313,7 +7473,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7324,7 +7484,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:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7336,26 +7496,26 @@ 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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-"
-"Daten in CDROM-IDs aus."
+"Daten in CD-ROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
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><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7363,48 +7523,48 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
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><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
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><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
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><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7413,12 +7573,12 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7427,23 +7587,23 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
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><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7452,12 +7612,12 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -7468,12 +7628,12 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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."
@@ -7483,24 +7643,24 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7509,12 +7669,12 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7523,12 +7683,12 @@ msgstr ""
"und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7538,12 +7698,12 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7551,12 +7711,12 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7566,12 +7726,12 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7587,12 +7747,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7607,9 +7767,9 @@ msgid ""
"there is none or if it is the same version as the installed. "
"<literal>section</literal> is the name of the section the package appears in."
msgstr ""
-"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als keep/"
-"install/remove markiert ist, währen der ProblemResolver seine Arbeit "
-"verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen "
+"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als "
+"»keep«/»install«/»remove« markiert ist, während der ProblemResolver seine "
+"Arbeit verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen "
"auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem "
"Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</"
"literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> "
@@ -7624,23 +7784,23 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7650,12 +7810,12 @@ msgstr ""
"sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7664,12 +7824,12 @@ msgstr ""
"alle während deren Auswertung gefundenen Fehler ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7679,12 +7839,12 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7692,22 +7852,22 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7717,12 +7877,12 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -7734,12 +7894,12 @@ msgstr ""
"beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7748,7 +7908,7 @@ msgstr ""
"gelesenen Anbieter ausgeben."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7757,13 +7917,13 @@ msgstr ""
"möglichen Optionen zeigen."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7834,25 +7994,36 @@ msgstr ""
"APT-Einstellungsdatei beeinflusst die Wahl der Instanz nicht, nur die Wahl "
"der Version."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr "APTs Standardprioritätszuweisungen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -7880,22 +8051,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr "Priorität 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr "Priorität 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7904,19 +8075,19 @@ msgstr ""
"gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr "Priorität 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -7927,7 +8098,7 @@ msgstr ""
"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -7938,7 +8109,7 @@ msgstr ""
"installierten Paketversionen eine Priorität von 500 zu."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7948,7 +8119,7 @@ msgstr ""
"ist."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7957,19 +8128,19 @@ msgid ""
"Note also that downgrading a package can be risky.)"
msgstr ""
"Führen Sie niemals ein Downgrade durch, außer wenn die Priorität verfügbarer "
-"Pakete 1000 übersteigt. »Downgrading« ist das Installieren einer weniger "
+"Pakete 1000 übersteigt. (»Downgrading« ist das Installieren einer weniger "
"aktuellen Version, an Stelle einer aktuelleren Version. Beachten Sie, dass "
"keine Standardpriorität von APT 1000 übersteigt. So hohe Prioritäten können "
"nur durch die Einstellungsdatei gesetzt werden. Beachten Sie außerdem, dass "
"Downgrading eines Paketes riskant sein kann.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr "Die Version mit der höchsten Priorität installieren."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7978,7 +8149,7 @@ msgstr ""
"aktuellste installiert (das ist die mit der höheren Versionsnummer)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7990,7 +8161,7 @@ msgstr ""
"installierte installiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8006,7 +8177,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8020,7 +8191,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8040,12 +8211,12 @@ msgstr ""
"hat."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr "Die Auswirkungen von APT-Einstellungen"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8059,7 +8230,7 @@ msgstr ""
"allgemeine Gestalt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8075,7 +8246,7 @@ msgstr ""
"können durch Leerzeichen getrennt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8087,7 +8258,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8102,7 +8273,7 @@ msgstr ""
"ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8110,10 +8281,10 @@ msgid ""
msgstr ""
"Dieser Eintrag in allgemeiner Form in der APT-Einstellungsdatei verwendet "
"nur Gruppen von Paketen. Der folgende Eintrag weist zum Beispiel allen "
-"Paketversionen eine hohe Priorität zu, die lokale liegen."
+"Paketversionen eine hohe Priorität zu, die lokal liegen."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -8125,7 +8296,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8141,7 +8312,7 @@ msgstr ""
"wie »Debian« oder »Ximian«."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8152,7 +8323,7 @@ msgstr ""
"Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -8164,7 +8335,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8175,7 +8346,7 @@ msgstr ""
"zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -8187,7 +8358,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8198,7 +8369,7 @@ msgstr ""
"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -8210,17 +8381,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8229,12 +8400,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8243,12 +8414,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8258,12 +8429,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8273,12 +8444,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8287,17 +8458,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8308,7 +8479,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8322,7 +8493,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8331,7 +8502,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8359,12 +8530,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8379,7 +8550,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8390,7 +8561,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8404,12 +8575,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8420,27 +8591,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8461,12 +8632,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8483,18 +8654,18 @@ msgstr ""
"folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8510,13 +8681,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8532,7 +8703,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8544,12 +8715,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8567,18 +8738,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8590,18 +8761,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8614,13 +8785,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8642,7 +8813,7 @@ msgstr ""
"relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8668,12 +8839,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8684,7 +8855,7 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8698,12 +8869,12 @@ msgstr ""
"anfängt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8727,7 +8898,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8742,8 +8913,8 @@ msgstr ""
"Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8755,7 +8926,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8768,13 +8939,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8788,12 +8959,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -8821,7 +8992,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8838,7 +9009,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8851,13 +9022,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8877,12 +9048,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8916,7 +9087,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8942,7 +9113,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8952,16 +9123,16 @@ msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
"(n) Version(en) im Release mit Codenamen <literal>squeeze</literal> "
-"durchzuführen.<placeholder type=\"programlisting\" id=\"0\"/>"
+"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8981,12 +9152,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9002,12 +9173,6 @@ msgstr "Paketressourcenliste für APT"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -9017,21 +9182,11 @@ msgstr ""
"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
"das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese "
"Handbuchseite nur das vom Debian-GNU/Linux-System benutzte "
-"Paketierungssystem. Die Steuerungsdatei befindet sich in <filename>/etc/apt/"
-"sources.list</filename>."
+"Paketierungssystem. Diese Steuerungsdatei ist <filename>/etc/apt/sources."
+"list</filename>."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -9083,17 +9238,6 @@ msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -9118,10 +9262,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -9137,16 +9277,6 @@ msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -9275,14 +9405,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9363,21 +9485,42 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
+#, fuzzy
+#| msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
+msgstr "weitere erkennbare URI-Typen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <literal>apt-transport-"
+#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similiar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see "
+#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
+#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgstr ""
+"APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
+"werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
+"replaceable></literal> folgen sollten, erweitert werden. Das APT-Team "
+"betreut z.B. außerdem das Paket <literal>apt-transport-https</literal>, das "
+"Zugriffsmethoden für HTTPS-URIs mit Funktionen bereitstellt, die denen der "
+"HTTP-Methode ähneln, bei der aber andere Methoden für z.B. debtorrent "
+"verfügbar sind, siehe <citerefentry> <refentrytitle><filename>apt-transport-"
+"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
+"citerefentry>."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
@@ -9385,8 +9528,8 @@ msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
-"Die aktuell erkannten URI-Typen sind cdrom, file, http, ftp, copy, ssh, rsh. "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, »copy«, "
+"»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:194
@@ -9407,7 +9550,7 @@ msgstr "deb file:/home/jason/debian stable main contrib non-free"
#: sources.list.5.xml:198
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
-"Wie oben, außer das dies die unstable- (Entwicklungs-) Distribution benutzt."
+"Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:199
@@ -9458,12 +9601,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9519,8 +9656,8 @@ msgstr ""
"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere "
"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses "
"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. "
-"non-us ist nicht länger so strukturiert] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:234
@@ -9530,28 +9667,30 @@ msgstr "&apt-cache; &apt-conf;"
#. type: <title></title>
#: guide.sgml:4
msgid "APT User's Guide"
-msgstr ""
+msgstr "APT-Benutzerhandbuch"
#. type: <author></author>
#: guide.sgml:6 offline.sgml:6
msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
+msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
#. type: <version></version>
#: guide.sgml:7
msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
+msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
#. type: <abstract></abstract>
#: guide.sgml:11
msgid ""
"This document provides an overview of how to use the the APT package manager."
msgstr ""
+"Dieses Dokument stellt eine Ãœbersicht bereit, wie das APT-"
+"Paketverwaltungsprogramm benutzt wird."
#. type: <copyrightsummary></copyrightsummary>
#: guide.sgml:15
msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1998."
#. type: <p></p>
#: guide.sgml:21 offline.sgml:22
@@ -9561,6 +9700,10 @@ msgid ""
"published by the Free Software Foundation; either version 2 of the License, "
"or (at your option) any later version."
msgstr ""
+"»APT« und dieses Dokument sind freie Software. Sie können sie weitergeben und/"
+"oder verändern unter den Bedingungen der GNU General Public License, wie sie "
+"von der Free Software Foundation veröffentlicht wird; entweder Version 2 der "
+"Lizenz oder (optional) jeder späteren Version."
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
@@ -9568,13 +9711,13 @@ msgid ""
"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
+"Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
+"licenses/GPL, die die vollständige Lizenz enthält."
#. type: <heading></heading>
#: guide.sgml:32
-#, fuzzy
-#| msgid "generate"
msgid "General"
-msgstr "generate"
+msgstr "Allgemein"
#. type: <p></p>
#: guide.sgml:38
@@ -9584,11 +9727,15 @@ msgid ""
"provide a way to install and remove packages as well as download new "
"packages from the Internet."
msgstr ""
+"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<prgn>dselect</prgn>-"
+"Methode und die Anwenderschnittstelle <prgn>apt-get</prgn> für die "
+"Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu installieren, "
+"zu entfernen, sowie neue Pakete aus dem Internet herunterzuladen."
#. type: <heading></heading>
#: guide.sgml:39
msgid "Anatomy of the Package System"
-msgstr ""
+msgstr "Anatomie des Paketsystems"
#. type: <p></p>
#: guide.sgml:44
@@ -9597,6 +9744,10 @@ msgid ""
"with each package to help assure that it integrates cleanly and easily into "
"the system. The most prominent of its features is the dependency system."
msgstr ""
+"Das Debian-Paketierungssystem besitzt eine große Anzahl von Informationen, "
+"die mit jedem Paket verbunden sind, um zu helfen sicherzustellen, dass es "
+"ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
+"Funktionen ist das Abhängigkeitssystem."
#. type: <p></p>
#: guide.sgml:52
@@ -9607,6 +9758,12 @@ msgid ""
"things the average user is required to install. Also, it allows for choices "
"in mail transport agents, X servers and so on."
msgstr ""
+"Das Abhängigkeitssystem erlaubt individuellen Programmen, Gebrauch von "
+"gemeinsam im System benutzten Elementen, wie Bibliotheken, zu machen. Es "
+"vereinfacht, selten benutze Teile eines Programms in separaten Paketen zu "
+"platzieren, um die Zahl von Dingen zu verringern, die der "
+"Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
+"von Mail-Transport-Agenten, X-Servern und so weiter."
#. type: <p></p>
#: guide.sgml:57
@@ -9616,15 +9773,32 @@ msgid ""
"package requires another package to be installed at the same time to work "
"properly."
msgstr ""
+"Der erste Schritt zum Verständnis des Abhängigkeitssystems besteht darin, "
+"das Konzept einer einfachen Abhängigkeit zu begreifen. Die Bedeutung einer "
+"einfachen Abhängigkeit besteht darin, dass ein Paket ein anderes Paket "
+"benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
+"funktionieren."
#. type: <p></p>
#: guide.sgml:63
+#, fuzzy
+#| msgid ""
+#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
+#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
+#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
+#| "extension it has a simple dependency on emacs, without emacs it is "
+#| "completely useless."
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
+"Mailcrypt ist zum Beispiel eine Emacs-Erweiterung, die hilft, E-Mails mit "
+"GPG zu verschlüsseln. Ohne installiertes GPG ist Mailcrypt unbrauchbar, "
+"deshalb hat Mailcrypt eine einfache Abhängigkeit von GPG. Da es außerdem "
+"eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
+"Emacs. Ohne Emacs ist es komplett unbenutzbar."
#. type: <p></p>
#: guide.sgml:73
@@ -9638,6 +9812,16 @@ msgid ""
"system so all mail transport agents have a conflicting dependency with all "
"other mail transport agents."
msgstr ""
+"Die andere wichtige Abhängigkeit, die es zu verstehen gilt, ist eine in "
+"Konflikt stehende Abhängigkeit. Das bedeutet, dass das Paket, wenn es mit "
+"einem anderen Paket installiert ist, nicht funktioniert und möglicherweise "
+"extrem schädlich für das System sein könnte. Stellen Sie sich als Beispiel "
+"einen Mail-Transport-Agenten wie Sendmail, Exim oder QMail vor. Es ist nicht "
+"möglich, zwei Mail-Transport-Agenten installiert zu haben, da beide im "
+"Netzwerk auf zu empfangende Mails warten. Der Versuch, zwei zu installieren, "
+"würde das System ernsthaft beschädigen, weshalb alle Mail-Transport-Agenten "
+"in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
+"haben."
#. type: <p></p>
#: guide.sgml:83
@@ -9651,6 +9835,15 @@ msgid ""
"depend on mail-transport-agent. This can add a great deal of confusion when "
"trying to manually fix packages."
msgstr ""
+"Als zusätzliche Komplikation besteht die Möglichkeit, dass ein Paket "
+"vortäuscht, ein anderes Paket zu sein. Bedenken Sie, dass Exim und Sendmail "
+"in vieler Hinsicht identisch sind – sie liefern beide E-Mails aus und "
+"verstehen eine gemeinsame Schnittstelle. Daher hat das Paketsystem die "
+"Möglichkeit, beide als Mail-Transport-Agenten zu deklarieren. Deshalb "
+"deklarieren Exim und Sendmail, dass sie einen Mail-Transport-Agenten "
+"bereitstellen und andere Pakete, die einen Mail-Transport-Agenten benötigen, "
+"dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
+"Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
#. type: <p></p>
#: guide.sgml:88
@@ -9660,6 +9853,11 @@ msgid ""
"issues by providing a number of automatic algorithms that help in selecting "
"packages for installation."
msgstr ""
+"Zu jeder Zeit könnte eine einzelne Abhängigkeit von Paketen vorgefunden "
+"werden, die bereits installiert sind oder nicht. APT versucht beim Auflösen "
+"von Abhängigkeitsproblemen zu helfen, indem es eine Anzahl automatischer "
+"Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
+"helfen."
#. type: <p></p>
#: guide.sgml:102
@@ -9669,6 +9867,10 @@ msgid ""
"understand .deb files, it works with the package's proper name and can only "
"install .deb archives from a <em>Source</em>."
msgstr ""
+"<prgn>apt-get</prgn> stellt eine einfache Möglichkeit zu Verfügung, Pakete "
+"auf der Befehlszeile zu installieren. Anders als <prgn>dpkg</prgn> versteht "
+"<prgn>apt-get</prgn> keine .deb-Dateien. Es arbeitet mit dem Eigennamen des "
+"Pakets und kann .deb-Archive nur aus einer <em>Quelle</em> installieren."
#. type: <p></p>
#: guide.sgml:109
@@ -9680,6 +9882,12 @@ msgid ""
"packages are available. This is done with <tt>apt-get update</tt>. For "
"instance,"
msgstr ""
+"Das Erste <footnote><p>Falls Sie einen HTTP-Proxy-Server benutzen, müssen "
+"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)</"
+"p></footnote>, das Sie vor der Benutzung von <prgn>apt-get</prgn> tun "
+"sollten, ist es, die Paketlisten von der <em>Quelle</em> herunterzuladen, so "
+"dass es weiß, welche Pakete verfügbar sind. Dies wird mit <tt>apt-get "
+"update</tt> erledigt. Zum Beispiel,"
#. type: <example></example>
#: guide.sgml:116
@@ -9691,11 +9899,16 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get update\n"
+"OK http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"OK http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Paketlisten werden gelesen... Fertig\n"
+"Abhängigkeitsbaum wird aufgebaut... Fertig"
#. type: <p><taglist>
#: guide.sgml:120
msgid "Once updated there are several commands that can be used:"
-msgstr ""
+msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
#. type: <p></p>
#: guide.sgml:131
@@ -9708,6 +9921,16 @@ msgid ""
"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
"<tt>apt-get install</tt> can be used to force these packages to install."
msgstr ""
+"»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
+"durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "
+"entfernen, noch wird es jemals ein Upgrade eines Pakets durchführen, das "
+"andere Pakete beschädigen könnte. Dies kann täglich dazu benutzt werden, um "
+"ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
+"Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
+"üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "
+"mit anderen Paketen haben. <prgn>dselect</prgn> oder <tt>apt-get install</"
+"tt> können benutzt werden, um die Installation von diesen Paketen zu "
+"erzwingen."
#. type: <p></p>
#: guide.sgml:140
@@ -9720,6 +9943,14 @@ msgid ""
"listed packages and will print a summary and ask for confirmation if "
"anything other than its arguments are changed."
msgstr ""
+"»Install« wird benutzt, um Pakete nach Namen zu installieren. Das Paket wird "
+"automatisch heruntergeladen und installiert. Dies kann nützlich sein, wenn "
+"Sie bereits den Namen des zu installierenden Pakets kennen und keine GUI "
+"aufrufen möchten, um es auszuwählen. Jede Anzahl von Paketen könnte zum "
+"Installieren übergeben werden, sie werden alle heruntergeladen. »Install« "
+"versucht automatisch Abhängigkeitsprobleme mit den aufgelisteten Paketen "
+"aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
+"fragen, wenn sich etwas anderes als dessen Argumente ändert."
#. type: <p></p>
#: guide.sgml:149
@@ -9732,6 +9963,16 @@ msgid ""
"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
"prgn> can be used to install any packages that may have been left out."
msgstr ""
+"»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
+"Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "
+"ausgeklügelten Algorithmus, um die beste Zusammenstellung von Paketen zum "
+"Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
+"möglich vom System auf das neuste Release zu bekommen. In einigen "
+"Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "
+"Zeit in das manuelle Auflösen von Abhängigkeiten in <prgn>dselect</prgn> zu "
+"investieren. Ist »Dist-upgrade« erst vollständig, dann kann <prgn>dselect</"
+"prgn> benutzt werden, um einige Pakete zu installieren, die außen vor "
+"geblieben sind."
#. type: <p></p>
#: guide.sgml:152
@@ -9739,6 +9980,8 @@ msgid ""
"It is important to closely look at what dist-upgrade is going to do, its "
"decisions may sometimes be quite surprising."
msgstr ""
+"Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
+"Entscheidungen können manchmal ziemlich überraschend sein."
#. type: <p></p>
#: guide.sgml:163
@@ -9751,13 +9994,20 @@ msgid ""
"the downloaded archives can be installed by simply running the command that "
"caused them to be downloaded again without <tt>-d</tt>."
msgstr ""
+"<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert "
+"in dessen Handbuchseite, <manref section=\"8\" name=\"apt-get\"> finden. Die "
+"nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht "
+"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, "
+"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet "
+"würde, wenn etwas schief läuft. Falls <tt>-d</tt> benutzt wird, können die "
+"heruntergeladenen Archive dadurch installiert werden, indem einfach der "
+"Befehl, der das Herunterladen veranlasste, erneut ohne <tt>-d</tt> ausführt "
+"wird."
#. type: <heading></heading>
#: guide.sgml:168
-#, fuzzy
-#| msgid "APT in DSelect"
msgid "DSelect"
-msgstr "APT in DSelect"
+msgstr "DSelect"
#. type: <p></p>
#: guide.sgml:173
@@ -9767,12 +10017,27 @@ msgid ""
"to select the packages to be installed or removed and APT actually installs "
"them."
msgstr ""
+"Die APT-<prgn>dselect</prgn>-Methode stellt das komplette APT-System mit dem "
+"<prgn>dselect</prgn>-Paketauswahl-GUI bereit. <prgn>dselect</prgn> wird "
+"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT "
+"installiert sie tatsächlich."
#. type: <p></p>
#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+#, fuzzy
+#| msgid ""
+#| "To enable the APT method you need to 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."
+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 "
@@ -9781,6 +10046,17 @@ msgid ""
"have access to the latest bug fixes. APT will automatically use packages on "
"your CDROM before downloading from the Internet."
msgstr ""
+"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
+"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
+"Zusammenstellung von <em>Quellen</em> gefragt. Dies sind Plätze, von denen "
+"Archive heruntergeladen werden. Dies können ferne Internetsites, lokale "
+"Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt des "
+"gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
+"kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
+"Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
+"Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
+"haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
+"dem Internet herunterlädt."
#. type: <example></example>
#: guide.sgml:198
@@ -9799,6 +10075,18 @@ msgid ""
" \n"
" URL [http://llug.sep.bnl.gov/debian]:"
msgstr ""
+" eine Liste mit Orten von Distributionsquellen einrichten\n"
+"\t \n"
+" Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
+" Die bekannten Zugriffsschemata dafür sind: http file\n"
+"\t \n"
+" Zum Beispiel:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
#. type: <p></p>
#: guide.sgml:205
@@ -9807,6 +10095,9 @@ msgid ""
"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
"get."
msgstr ""
+"Das Einrichten der <em>Quellen</em> beginnt durch das Erfragen der Basis des "
+"Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird nach der "
+"zu erhaltenden Distribution gefragt."
#. type: <example></example>
#: guide.sgml:212
@@ -9818,6 +10109,9 @@ msgid ""
" \n"
" Distribution [stable]:"
msgstr ""
+" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind normalerweise etwas wie: stable unstable testing non-US\n"
+" \n"
+" Distribution [stable]:"
#. type: <p></p>
#: guide.sgml:222
@@ -9829,6 +10123,13 @@ msgid ""
"that cannot be exported from the United States. Importing these packages "
"into the US is legal however."
msgstr ""
+"Die Distribution bezieht sich auf die Debian-Version im Archiv, <em>stable</"
+"em> bezieht sich auf die zuletzt veröffentlichte Version und <em>unstable</"
+"em> bezieht sich auf die Entwicklungsversion. <em>non-US</em> ist nur auf "
+"einigen Spiegeln verfügbar und bezieht sich auf Pakete, die "
+"Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
+"Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
+"importieren ist jedoch legal."
#. type: <example></example>
#: guide.sgml:228
@@ -9839,6 +10140,10 @@ msgid ""
" \n"
" Components [main contrib non-free]:"
msgstr ""
+" Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
+" Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
+" \n"
+" Komponenten [main contrib non-free]:"
#. type: <p></p>
#: guide.sgml:236
@@ -9848,6 +10153,11 @@ msgid ""
"packages while contrib and non-free contain things that have various "
"restrictions placed on their use and distribution."
msgstr ""
+"Die Komponentenliste bezieht sich auf die Liste von Unter-Distributionen zum "
+"Herunterladen. Die Distribution ist auf Basis von Software-Lizenzen "
+"unterteilt, »Main« besteht aus Paketen die gemäß der DFSG frei sind, während "
+"»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen in "
+"ihrer Benutzung und ihren Vertrieb haben."
#. type: <p></p>
#: guide.sgml:240
@@ -9855,16 +10165,32 @@ msgid ""
"Any number of sources can be added, the setup script will continue to prompt "
"until you have specified all that you want."
msgstr ""
+"Jegliche Anzahl von Quellen kann hinzugefügt werden, das Einrichtungsskript "
+"wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
+"möchten."
#. type: <p></p>
#: guide.sgml:247
+#, fuzzy
+#| msgid ""
+#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+#| "available list by selecting [U]pdate from the menu. This is a super-set "
+#| "of <tt>apt-get update</tt> that makes the fetched information available "
+#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
+#| "update</tt> has been run before."
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
msgstr ""
+"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
+"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
+"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
+"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]"
+"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</"
+"tt> ausgeführt wurde."
#. type: <p></p>
#: guide.sgml:253
@@ -9874,6 +10200,10 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
+"Sie können dann fortfahren und Ihre Auswahl per [A]uswähle treffen und dann "
+"die Installation mit [I]nstall. vornehmen. Wenn Sie die APT-Methode "
+"benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
+"Befehl [I]nstall. führt beides gleichermaßen aus."
#. type: <p></p>
#: guide.sgml:258
@@ -9882,11 +10212,14 @@ msgid ""
"have been successfully installed. To change this behavior place <tt>Dselect::"
"clean \"prompt\";</tt> in /etc/apt/apt.conf."
msgstr ""
+"Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
+"sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "
+"Sie <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
#. type: <heading></heading>
#: guide.sgml:264
msgid "The Interface"
-msgstr ""
+msgstr "Die Schnittstelle"
#. type: <p></p>
#: guide.sgml:278
@@ -9900,11 +10233,20 @@ msgid ""
"then will print out some informative status messages so that you can "
"estimate how far along it is and how much is left to do."
msgstr ""
+"Sowohl die APT-Methode <prgn>dselect</prgn>, als auch <prgn>apt-get</prgn> "
+"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das "
+"üblicherweise mitteilt, was es tun wird und es dann tut. <footnote><p>Die "
+"Methode <prgn>dselect</prgn> ist tatsächlich eine Zusammenstellung von "
+"Wrapper-Skripten für <prgn>apt-get</prgn>. Die Methode stellt tatsächlich "
+"mehr Funktionalitäten bereit, als in <prgn>apt-get</prgn> allein vorhanden "
+"sind.</p></footnote> Nach der Ausgabe einer Zusammenfassung was passieren "
+"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie "
+"abschätzen können, wie weit es ist und wieviel noch zu tun ist."
#. type: <heading></heading>
#: guide.sgml:280
msgid "Startup"
-msgstr ""
+msgstr "Anfang"
#. type: <p></p>
#: guide.sgml:284
@@ -9914,6 +10256,10 @@ msgid ""
"At any time these operations can be performed by running <tt>apt-get check</"
"tt>."
msgstr ""
+"Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
+"Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
+"einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "
+"Ausführung von <tt>apt-get check</tt> durchgeführt werden."
#. type: <example></example>
#: guide.sgml:289
@@ -9923,6 +10269,9 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get check\n"
+"Paketlisten werden gelesen... Fertig\n"
+"Abhängigkeitsbaum wird aufgebaut"
#. type: <p></p>
#: guide.sgml:297
@@ -9932,6 +10281,11 @@ msgid ""
"If some of the package files are not found then they will be ignored and a "
"warning will be printed when apt-get exits."
msgstr ""
+"Das erste was es tut, ist das Einlesen aller Paketdateien in den Speicher. "
+"APT benutzt ein Zwischenspeicherschema, so dass diese Operation beim zweiten "
+"Ausführen schneller laufen wird. Falls einige der Paketdateien nicht "
+"gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
+"Warnung ausgegeben."
#. type: <p></p>
#: guide.sgml:303
@@ -9941,6 +10295,11 @@ msgid ""
"package and considers if it is OK. Should this find a problem then a report "
"will be printed out and <prgn>apt-get</prgn> will refuse to run."
msgstr ""
+"Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
+"Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
+"entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "
+"Problem finden, dann wird eine Meldung ausgegeben und <prgn>apt-get</prgn> "
+"wird die Ausführung verweigern."
#. type: <example></example>
#: guide.sgml:320
@@ -9962,6 +10321,22 @@ msgid ""
" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
msgstr ""
+"# apt-get check\n"
+"Paketlisten werden gelesen... Fertig\n"
+"Abhängigkeitsbaum wird aufgebaut\n"
+"Status-Informationen einlesen... Fertig\n"
+"Probieren Sie „apt-get -f install“, um diese zu korrigieren:\n"
+"Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
+" 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
+" uucp: Hängt ab: mailx ist aber nicht installiert\n"
+" blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+" adduser: Hängt ab: perl-base ist aber nicht installiert\n"
+" aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
+" debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"
+" bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n"
+" cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"
+" Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
#. type: <p></p>
#: guide.sgml:329
@@ -9972,6 +10347,11 @@ msgid ""
"that are unmet. A short explanation of why the package has a dependency "
"problem is also included."
msgstr ""
+"In diesem Beispiel hat das System viele Probleme, einschließlich eines "
+"ernsten Problems mit libreadlineg2. Für jedes Paket, das nichterfüllte "
+"Abhängigkeiten hat, wird eine Zeile ausgegeben, die das Paket mit dem "
+"Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
+"Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
#. type: <p></p>
#: guide.sgml:337
@@ -9984,6 +10364,14 @@ msgid ""
"situation a package may have been unpacked without its dependents being "
"installed."
msgstr ""
+"Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
+"diesen kommen kann. Die erste wird dadurch verursacht, dass <prgn>dpkg</"
+"prgn> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
+"durchgeführt werden. <footnote><p>APT berücksichtigt jedoch alle bekannten "
+"Abhängigkeiten und versucht, kaputte Pakete zu vermeiden</p></footnote>. Die "
+"zweite tritt auf, falls eine Paketinstallation während der Ausführung "
+"fehlschlägt. In dieser Situation könnte ein Paket entpackt worden sein, ohne "
+"dass die von ihm Abhängigen installiert sind."
#. type: <p></p>
#: guide.sgml:345
@@ -9995,6 +10383,12 @@ msgid ""
"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
"for easy continuation of failed maintainer scripts."
msgstr ""
+"Die zweite Situation ist weit weniger ernst als die erste, weil APT "
+"bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "
+"werden. In beiden Fällen veranlasst die Option <tt>-f</tt> <prgn>apt-get</"
+"prgn>, eine mögliche Lösung für das Problem zu folgern und dann "
+"fortzufahren. Die APT-Methode <prgn>dselect</prgn> liefert immer die Option "
+"<tt>-f</tt>, zum einfachen Fortfahren von gescheiterten Betreuerskripten."
#. type: <p></p>
#: guide.sgml:351
@@ -10005,11 +10399,17 @@ msgid ""
"necessary to manually use dpkg (possibly with forcing options) to correct "
"the situation enough to allow APT to proceed."
msgstr ""
+"Falls jedoch die Option <tt>-f</tt> benutzt wird, um ein ernsthaft kaputtes "
+"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es "
+"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge "
+"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit "
+"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu "
+"korrigieren, so dass es APT ermöglicht wird, fortzufahren."
#. type: <heading></heading>
#: guide.sgml:356
msgid "The Status Report"
-msgstr ""
+msgstr "Der Statusbericht"
#. type: <p></p>
#: guide.sgml:363
@@ -10020,11 +10420,17 @@ msgid ""
"final state of things, taking into account the <tt>-f</tt> option and any "
"other relevant activities to the command being executed."
msgstr ""
+"Bevor es fortfährt, wird <prgn>apt-get</prgn> einen Bericht darüber "
+"präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
+"Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
+"geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "
+"Dinge wider, bezieht die Option <tt>-f</tt> in Betracht und alle andere "
+"relevante Aktivitäten zum Befehl, der ausgeführt wird."
#. type: <heading></heading>
#: guide.sgml:364
msgid "The Extra Package list"
-msgstr ""
+msgstr "Die zusätzliche Paketliste"
#. type: <example></example>
#: guide.sgml:372
@@ -10037,6 +10443,12 @@ msgid ""
" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
" ssh"
msgstr ""
+"Die folgenden Pakete werden zusätzlich installiert:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
#. type: <p></p>
#: guide.sgml:379
@@ -10046,11 +10458,16 @@ msgid ""
"generated for an <tt>install</tt> command. The listed packages are often the "
"result of an Auto Install."
msgstr ""
+"Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
+"von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "
+"Befehlszeile angegebenen. Sie wird nur für einen <tt>install</tt>-Befehl "
+"generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
+"automatischen Installation."
#. type: <heading></heading>
#: guide.sgml:382
msgid "The Packages to Remove"
-msgstr ""
+msgstr "Die zu entfernenden Pakete"
#. type: <example></example>
#: guide.sgml:389
@@ -10062,6 +10479,11 @@ msgid ""
" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
" nas xpilot xfig"
msgstr ""
+"Die folgenden Pakete werden ENTFERNT:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
#. type: <p></p>
#: guide.sgml:399
@@ -10074,11 +10496,19 @@ msgid ""
"that are going to be removed because they are only partially installed, "
"possibly due to an aborted installation."
msgstr ""
+"Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
+"entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
+"sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "
+"dass nichts Wichtiges weggenommen wird. Die Option <tt>-f</tt> ist "
+"insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
+"Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
+"Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
+"sind, möglicherweise aufgrund einer abgebrochenen Installation."
#. type: <heading></heading>
#: guide.sgml:402
msgid "The New Packages list"
-msgstr ""
+msgstr "Die Liste neuer Pakete"
#. type: <example></example>
#: guide.sgml:406
@@ -10087,6 +10517,8 @@ msgid ""
"The following NEW packages will installed:\n"
" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
msgstr ""
+"Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
#. type: <p></p>
#: guide.sgml:411
@@ -10095,11 +10527,14 @@ msgid ""
"listed are not presently installed in the system but will be when APT is "
"done."
msgstr ""
+"Die Liste neuer Pakete ist einfache eine Erinnerung, was geschehen wird. Die "
+"aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
+"es aber sein, wenn APT fertig ist."
#. type: <heading></heading>
#: guide.sgml:414
msgid "The Kept Back list"
-msgstr ""
+msgstr "Die Liste zurückgehaltener Pakete"
#. type: <example></example>
#: guide.sgml:419
@@ -10109,6 +10544,9 @@ msgid ""
" compface man-db tetex-base msql libpaper svgalib1\n"
" gs snmp arena lynx xpat2 groff xscreensaver"
msgstr ""
+"Die folgenden Pakete werden zurückgehalten:\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
#. type: <p></p>
#: guide.sgml:428
@@ -10120,11 +10558,18 @@ msgid ""
"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
"to resolve their problems."
msgstr ""
+"Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
+"Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
+"können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
+"installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
+"zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "
+"zur Installation zu bewegen, ist per <tt>apt-get install</tt> oder indem "
+"<prgn>dselect</prgn> zum Lösen ihrer Probleme benutzt wird."
#. type: <heading></heading>
#: guide.sgml:431
msgid "Held Packages warning"
-msgstr ""
+msgstr "Warnung wegen zurückgehaltener Pakete"
#. type: <example></example>
#: guide.sgml:435
@@ -10133,6 +10578,8 @@ msgid ""
"The following held packages will be changed:\n"
" cvs"
msgstr ""
+"Die folgenden zurückgehaltenen Pakete werden geändert:\n"
+" cvs"
#. type: <p></p>
#: guide.sgml:441
@@ -10141,17 +10588,23 @@ msgid ""
"case it prints out a warning that the held package is going to be changed. "
"This should only happen during dist-upgrade or install."
msgstr ""
+"Manchmal können Sie APT bitten, ein auf »zurückgehalten« gesetztes Paket zu "
+"installieren. In einem solchen Fall gibt es eine Warnung aus, dass das "
+"zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
+"oder »Install« vorkommen."
#. type: <heading></heading>
#: guide.sgml:444
msgid "Final summary"
-msgstr ""
+msgstr "Abschließende Zusammenfassung"
#. type: <p></p>
#: guide.sgml:447
msgid ""
"Finally, APT will print out a summary of all the changes that will occur."
msgstr ""
+"Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
+"auftreten werden."
#. type: <example></example>
#: guide.sgml:452
@@ -10161,6 +10614,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
+"206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
+"12 Pakete nicht vollständig installiert oder entfernt.\n"
+"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein."
#. type: <p></p>
#: guide.sgml:470
@@ -10179,6 +10635,19 @@ msgid ""
"If a large number of packages are being removed then the value may indicate "
"the amount of space that will be freed."
msgstr ""
+"Die erste Zeile der Zusammenfassung ist bloß eine Zusammenfassung von all "
+"den Listen und umfasst die Anzahl der Upgrades – das sind bereits "
+"installierte Pakete, für die neue Versionen verfügbar sind. Die zweite Zeile "
+"zeigt die Anzahl von schlecht konfigurierten Paketen, die möglicherweise das "
+"Ergebnis einer abgebrochenen Installation sind. Die letzt Zeile zeigt den "
+"Speicherbedarf, den die Installation benötigt. Das erste Zahlenpaar bezieht "
+"sich auf die Größe der Archivdateien. Die erste Zahl zeigt die Anzahl der "
+"Bytes an, die von fernen Orten heruntergeladen werden müssen und die zweite "
+"zeigt die gesamte Größe aller benötigten Archive an. Die nächste Zahl zeigt "
+"den Größenunterschied zwischen den derzeit installierten Paketen und den neu "
+"installierten Paketen. Es entspricht ungefähr dem in /usr benötigten "
+"Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
+"wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
#. type: <p></p>
#: guide.sgml:473
@@ -10186,11 +10655,14 @@ msgid ""
"Some other reports can be generated by using the -u option to show packages "
"to upgrade, they are similar to the previous examples."
msgstr ""
+"Einige andere Berichte können durch Benutzung der Option »-u« generiert "
+"werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
+"soll. Dies ist den vorherigen Beispielen ähnlich."
#. type: <heading></heading>
#: guide.sgml:477
msgid "The Status Display"
-msgstr ""
+msgstr "Der Anzeigestatus"
#. type: <p></p>
#: guide.sgml:481
@@ -10198,6 +10670,8 @@ msgid ""
"During the download of archives and package files APT prints out a series of "
"status messages."
msgstr ""
+"Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
+"von Statusmeldungen aus."
#. type: <example></example>
#: guide.sgml:490
@@ -10211,6 +10685,13 @@ msgid ""
"Get: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"
msgstr ""
+"# apt-get update\n"
+"Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Hole:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s"
#. type: <p></p>
#: guide.sgml:500
@@ -10222,6 +10703,13 @@ msgid ""
"<tt>apt-get update</tt> estimates the percent done which causes some "
"inaccuracies."
msgstr ""
+"Die Zeilen, die mit <em>Hole</em> beginnen, werden ausgegeben, wenn APT "
+"anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
+"Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
+"Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "
+"Unglücklicherweise schätzt <tt>apt-get update</tt> die erledigte "
+"Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
+"Ungenauigkeiten bewirkt."
#. type: <p></p>
#: guide.sgml:509
@@ -10234,6 +10722,14 @@ msgid ""
"The next word is the short form name of the object being downloaded. For "
"archives it will contain the name of the package that is being fetched."
msgstr ""
+"Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
+"wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
+"Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "
+"einfach nur <em>Forking</em> darstellen, was bedeutet, dass das "
+"Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
+"ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
+"nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
+"Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
#. type: <p></p>
#: guide.sgml:524
@@ -10252,6 +10748,21 @@ msgid ""
"regularly and reflects the time to complete everything at the shown transfer "
"rate."
msgstr ""
+"Innerhalb von einzelnen Anführungszeichen folgt eine informative "
+"Zeichenkette, die den Fortschritt der Ãœbertragungsphase des Downloads "
+"anzeigt. Normalerweise schreitet sie fort von <em>Verbinde</em> zu <em>Warte "
+"auf Datei</em> zu <em>Lade herunter</em> oder <em>Nehme wieder auf</em>. Der "
+"letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen Bytes. "
+"Sobald der Download beginnt, zeigt sich dies wie <tt>102/10.2k</tt> was "
+"anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
+"Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
+"Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "
+"selbst. Das zweitletzte Element ist die augenblickliche "
+"Fortschrittsgeschwindigkeit. Dieser Wert wird alle fünf Sekunden "
+"aktualisiert und spiegelt die Datenübertragungsgeschwindigkeit in dieser "
+"Periode wider. Am Ende wird die geschätzte Übertragungszeit angezeigt. Dies "
+"wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
+"der angezeigten Datenübertragungsgeschwindigkeit wider."
#. type: <p></p>
#: guide.sgml:530
@@ -10262,11 +10773,17 @@ msgid ""
"for logging to a file, use the <tt>-q</tt> option to remove the status "
"display."
msgstr ""
+"Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
+"Rückmeldung über den Download-Fortschritt bereitzustellen, während die »Hole«-"
+"Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
+"Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "
+"eine Datei ungeeignet. Benutzen Sie die Option <tt>-q</tt>, um die "
+"Statusanzeige zu entfernen."
#. type: <heading></heading>
#: guide.sgml:535
msgid "Dpkg"
-msgstr ""
+msgstr "Dpkg"
#. type: <p></p>
#: guide.sgml:542
@@ -10278,16 +10795,23 @@ msgid ""
"each question there is usually a description of what it is asking and the "
"questions are too varied to discuss completely here."
msgstr ""
+"APT benutzt <prgn>dpkg</prgn>, um die Archive zu installieren und wird zu "
+"der <prgn>dpkg</prgn>-Schnittstelle herüberschalten, sobald der Download "
+"vollständig ist. <prgn>dpkg</prgn> wird außerdem eine Reihe von Fragen "
+"stellen, während es die Pakete abarbeitet und die Pakete können auch mehrere "
+"Fragen stellen . Vor jeder Frage ist üblicherweise eine Beschreibung des "
+"Gefragten und die Fragen sind zu vielfältig, um sie vollständig hier zu "
+"besprechen."
#. type: <title></title>
#: offline.sgml:4
msgid "Using APT Offline"
-msgstr ""
+msgstr "APT offline verwenden"
#. type: <version></version>
#: offline.sgml:7
msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
+msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
#. type: <abstract></abstract>
#: offline.sgml:12
@@ -10295,23 +10819,24 @@ msgid ""
"This document describes how to use APT in a non-networked environment, "
"specifically a 'sneaker-net' approach for performing upgrades."
msgstr ""
+"Dieses Dokument beschreibt, wie APT in einer Umgebung ohne Netzwerk, "
+"speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
+"herangeht."
#. type: <copyrightsummary></copyrightsummary>
#: offline.sgml:16
msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1999."
#. type: <heading></heading>
#: offline.sgml:32
msgid "Introduction"
-msgstr ""
+msgstr "Einleitung"
#. type: <heading></heading>
#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-#| msgid "OverrideDir"
msgid "Overview"
-msgstr "OverrideDir"
+msgstr "Ãœbersicht"
#. type: <p></p>
#: offline.sgml:40
@@ -10321,6 +10846,11 @@ msgid ""
"machine is on a slow link, such as a modem and another machine has a very "
"fast connection but they are physically distant."
msgstr ""
+"Normalerweise benötigt APT direkten Zugang zu einem Debian-Archiv, entweder "
+"von einem lokalen Medium oder über ein Netz. Eine andere häufige "
+"Beanstandung ist, dass eine Debian-Maschine an einer langsamen Anbindung, "
+"wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
+"Verbindung hat, sie jedoch physisch fern sind."
#. type: <p></p>
#: offline.sgml:51
@@ -10335,20 +10865,42 @@ msgid ""
"the machine downloading the packages, and <em>target host</em> the one with "
"bad or no connection."
msgstr ""
+"Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
+"eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "
+"ganzes Debian-Archiv zu speichern, können aber leicht eine Untermenge "
+"aufnehmen, die für die meisten Anwender groß genug ist. Die Idee besteht "
+"darin, APT zu benutzen, um eine Liste benötigter Pakete zu generieren und "
+"diese dann mit einer anderen Maschine mit guter Verbindung auf die Platte "
+"herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
+"oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
+"wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "
+"<em>ferner Rechner</em> und die mit der schlechten oder fehlenden Verbindung "
+"<em>Zielrechner</em>."
#. type: <p></p>
#: offline.sgml:57
+#, fuzzy
+#| msgid ""
+#| "This is achieved by creatively manipulating the APT configuration file. "
+#| "The essential premis to tell APT to look on a disc for it's archive "
+#| "files. Note that the disc should be formated with a filesystem that can "
+#| "handle long file names such as ext2, fat32 or vfat."
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
+"Dies wird durch kreatives Manipulieren der APT-Konfigurationsdatei erreicht. "
+"Die wesentliche Voraussetzung besteht darin, APT mitzuteilen, dass es für "
+"seine Archivdateien auf einer Platte nachsieht. Beachten Sie, dass diese "
+"Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
+"Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
#. type: <heading></heading>
#: offline.sgml:63
msgid "Using APT on both machines"
-msgstr ""
+msgstr "APT auf beiden Maschinen benutzen"
#. type: <p><example>
#: offline.sgml:71
@@ -10358,6 +10910,11 @@ msgid ""
"remote machine to fetch the latest package files and decide which packages "
"to download. The disk directory structure should look like:"
msgstr ""
+"Ein verfügbares APT auf beiden Maschinen stellt die einfachste Konfiguration "
+"dar. Die Grundidee besteht darin, eine Kopie der Statusdatei auf der Platte "
+"zu platzieren und die ferne Maschine zu benutzen, um die neusten "
+"Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
+"heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
#. type: <example></example>
#: offline.sgml:80
@@ -10372,13 +10929,19 @@ msgid ""
" sources.list\n"
" apt.conf"
msgstr ""
+" /Platte/\n"
+" Archive/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
#. type: <heading></heading>
#: offline.sgml:88
-#, fuzzy
-#| msgid "User configuration"
msgid "The configuration file"
-msgstr "Benutzerkonfiguration"
+msgstr "Die Konfigurationsdatei"
#. type: <p></p>
#: offline.sgml:96
@@ -10390,6 +10953,13 @@ msgid ""
"<em>target host</em>. Please note, if you are using a local archive you must "
"use copy URIs, the syntax is identical to file URIs."
msgstr ""
+"Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
+"Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
+"benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf der "
+"fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie von "
+"<em>/var/lib/dpkg/status</em> vom <em>Zielrechner</em> sein. Bitte beachten "
+"Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs benutzen müssen. "
+"Die Syntax entspricht der von »file«-URIs."
#. type: <p><example>
#: offline.sgml:100
@@ -10397,6 +10967,8 @@ msgid ""
"<em>apt.conf</em> must contain the necessary information to make APT use the "
"disc:"
msgstr ""
+"<em>apt.conf</em> muss die nötigen Informationen enthalten, damit APT die "
+"Platte benutzt:"
#. type: <example></example>
#: offline.sgml:124
@@ -10426,6 +10998,29 @@ msgid ""
" Etc \"/disc/\";\n"
" };"
msgstr ""
+" APT\n"
+" {\n"
+" /* Dies ist nicht nötig, falls die beiden Maschinen die gleiche\n"
+" Architektur haben. Es teilt dem fernen APT mit, welche Architektur die Zielmaschine hat */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"
+" umleiten von /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Programmzwischenspeicher werden lokal gespeichert\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Ort der Quellenliste.\n"
+" Etc \"/disc/\";\n"
+" };"
#. type: </example></p>
#: offline.sgml:129
@@ -10433,20 +11028,41 @@ msgid ""
"More details can be seen by examining the apt.conf man page and the sample "
"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
msgstr ""
+"Weitere Details finden sich in der apt.conf-Handbuchseite und der "
+"Musterkonfigurationsdatei in <em>/usr/share/doc/apt/examples/apt.conf</em>."
#. type: <p><example>
#: offline.sgml:136
+#, fuzzy
+#| msgid ""
+#| "On the target machine the first thing to do is mount the disc and copy "
+#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
+#| "directories outlined in the Overview, <em>archives/partial/</em> and "
+#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
+#| "configure the sources.list. On the remote machine execute the following:"
msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
+"Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "
+"Platte und das Kopieren von <em>/var/lib/dpkg/status</em> dorthin. Sie "
+"werden außerdem die in der Übersicht umrissenen Verzeichnisse <em>archives/"
+"partial/</em> und <em>lists/partial/</em> erstellen müssen. Dann bringen Sie "
+"die Platte zu der fernen Maschine und konfigurieren Sie die »sources.list«. "
+"Führen Sie das folgende aus:"
#. type: <example></example>
#: offline.sgml:142
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " # export APT_CONFIG=\"/disc/apt.conf\"\n"
+#| " # apt-get update\n"
+#| " [ APT fetches the package files ]\n"
+#| " apt-get dist-upgrade\n"
+#| " [ APT fetches all the packages needed to upgrade the target machine ]"
msgid ""
" # export APT_CONFIG=\"/disc/apt.conf\"\n"
" # apt-get update\n"
@@ -10454,15 +11070,31 @@ msgid ""
" # apt-get dist-upgrade\n"
" [ APT fetches all the packages needed to upgrade the target machine ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT lädt die Paketdateien herunter ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"
+" Upgrade durchzuführen ]"
#. type: </example></p>
#: offline.sgml:149
+#, fuzzy
+#| msgid ""
+#| "The dist-upgrade command can be replaced with any-other standard APT "
+#| "commands, particularly dselect-upgrade. You can even use an APT front end "
+#| "such as <em>dselect</em> However this presents a problem in communicating "
+#| "your selections back to the local computer."
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
+"Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
+"ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"
+"Oberfläche, wie <em>dselect</em>, benutzen. Jedoch stellt dies ein Problem "
+"dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
#. type: <p><example>
#: offline.sgml:153
@@ -10470,6 +11102,9 @@ msgid ""
"Now the disc contains all of the index files and archives needed to upgrade "
"the target machine. Take the disc back and run:"
msgstr ""
+"Nun enthält die Platte alle Indexdateien und Archive, die nötig sind, um ein "
+"Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
+"starten Sie:"
#. type: <example></example>
#: offline.sgml:159
@@ -10481,6 +11116,11 @@ msgid ""
" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
" [ Or any other APT command ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Oder irgendeinen anderen APT-Befehl ]"
#. type: <p></p>
#: offline.sgml:165
@@ -10488,6 +11128,8 @@ msgid ""
"It is necessary for proper function to re-specify the status file to be the "
"local one. This is very important!"
msgstr ""
+"Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
+"die lokale anzugeben. Dies ist sehr wichtig!"
#. type: <p></p>
#: offline.sgml:172
@@ -10498,11 +11140,18 @@ msgid ""
"the local machine - but this may not always be possible. DO NOT copy the "
"status file if dpkg or APT have been run in the mean time!!"
msgstr ""
+"Wenn Sie Dselect benutzen, können Sie die sehr riskante Operation "
+"durchführen, disc/status auf /var/lib/dpkg/status zu kopieren, so dass die "
+"von Ihnen gemachte Auswahl auf der fernen Maschine aktualisiert wird. Es "
+"wird in höchstem Maße empfohlen, dass Leute nur auf der lokalen Maschine "
+"Auswahlen treffen – aber dies könnte manchmal unmöglich sein. Kopieren Sie "
+"die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
+"wurden!"
#. type: <heading></heading>
#: offline.sgml:178
msgid "Using APT and wget"
-msgstr ""
+msgstr "APT und Wget benutzen"
#. type: <p></p>
#: offline.sgml:185
@@ -10511,6 +11160,9 @@ msgid ""
"any machine. Unlike the method above this requires that the Debian machine "
"already has a list of available packages."
msgstr ""
+"<em>wget</em> ist eine populäres und portierbares Download-Werkzeug, das auf "
+"nahezu jeder Maschine laufen kann. Anders als die Methode oben wird hierfür "
+"benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer Pakete hat."
#. type: <p></p>
#: offline.sgml:190
@@ -10520,13 +11172,15 @@ msgid ""
"option to apt-get and then preparing a wget script to actually fetch the "
"packages."
msgstr ""
+"Die Grundidee besteht darin, eine Platte zu erzeugen, die nur die "
+"heruntergeladenen Archivdateien von der fernen Site enthält. Die wird durch "
+"Benutzen der apt-get-Option »--print-uris« und dem anschließenden Vorbereiten "
+"eines Wget-Skripts getan, um die eigentlichen Pakete herunterzuladen."
#. type: <heading></heading>
#: offline.sgml:196
-#, fuzzy
-#| msgid "Options"
msgid "Operation"
-msgstr "Optionen"
+msgstr "Betrieb"
#. type: <p><example>
#: offline.sgml:200
@@ -10534,6 +11188,9 @@ msgid ""
"Unlike the previous technique no special configuration files are required. "
"We merely use the standard APT commands to generate the file list."
msgstr ""
+"Anders als bei der vorherigen Technik werden keine speziellen "
+"Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
+"benutzt, um die Dateiliste zu erstellen."
#. type: <example></example>
#: offline.sgml:205
@@ -10544,6 +11201,11 @@ msgid ""
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
+" # apt-get dist-upgrade \n"
+" [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
+" zufrieden sind ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script"
#. type: </example></p>
#: offline.sgml:210
@@ -10551,6 +11213,8 @@ msgid ""
"Any command other than dist-upgrade could be used here, including dselect-"
"upgrade."
msgstr ""
+"Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
+"einschließlich »upgrade«."
#. type: <p></p>
#: offline.sgml:216
@@ -10560,11 +11224,15 @@ msgid ""
"with the current directory as the disc's mount point so as to save the "
"output on the disc."
msgstr ""
+"Die Datei /Platte/wget-script wird nun eine Liste der Wget-Befehle "
+"enthalten, um die erforderlichen Archive herunterzuladen. Dieses Skript "
+"sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
+"werden, so dass die Ausgabe auf die Platte gespeichert wird."
#. type: <p><example>
#: offline.sgml:219
msgid "The remote machine would do something like"
-msgstr ""
+msgstr "Die ferne Maschine würde etwas wie das folgende tun"
#. type: <example></example>
#: offline.sgml:223
@@ -10574,6 +11242,9 @@ msgid ""
" # sh -x ./wget-script\n"
" [ wait.. ]"
msgstr ""
+" # cd /Platte\n"
+" # sh -x ./wget-script\n"
+" [ warten ... ]"
#. type: </example><example>
#: offline.sgml:228
@@ -10581,28 +11252,46 @@ msgid ""
"Once the archives are downloaded and the disc returned to the Debian machine "
"installation can proceed using,"
msgstr ""
+"Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
+"zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
#. type: <example></example>
#: offline.sgml:230
#, no-wrap
msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
+msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
#. type: </example></p>
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
-msgstr ""
+msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse. Use at "
-#~ "your own risk."
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die "
+#~ "APT-Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und "
+#~ "einen gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung "
+#~ "bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der "
+#~ "Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene "
+#~ "Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, "
+#~ "dann die durch <literal>Dir::Etc::main</literal> angegebene "
+#~ "Konfigurationsdatei und übernimmt am Ende die Befehlszeilenoptionen, um "
+#~ "Konfigurationsdirektiven zu überschreiben und möglicherweise sogar "
+#~ "weitere Konfigurationsdateien zu laden."
+
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+
+#~ msgid "Keyring of local trusted keys, new keys will be added here."
#~ msgstr ""
-#~ "Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet "
-#~ "einigen Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener "
-#~ "aufzurufen. Dies zu tun, könnte auf besonders langsamen "
-#~ "Einzelbenutzersystemen nötig sein, ist aber gefährlich und könnte "
-#~ "Paketinstallationsskripte zum Scheitern oder schlimmeren veranlassen. "
-#~ "Benutzen Sie es auf eigene Gefahr."
+#~ "Schlüsselring der lokalen vertrauenswürdigen Schlüssel, neue Schlüssel "
+#~ "werden hier hinzugefügt."
diff --git a/doc/po/es.po b/doc/po/es.po
index 266f69c02..533978695 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2004-09-20 17:05+0000\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: <debian-l10n-spanish@lists.debian.org>\n"
@@ -789,7 +789,7 @@ msgstr ""
"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>."
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, fuzzy, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -811,6 +811,93 @@ msgstr ""
"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)."
+#. type: Plain text
+#: apt.ent:362
+#, fuzzy, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n"
+"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n"
+"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n"
+"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n"
+"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n"
+"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n"
+"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>."
+
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)."
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap, fuzzy
+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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),\n"
+" Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),\n"
+" Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),\n"
+" Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)\n"
+" and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)\n"
+" under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -903,7 +990,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
#, fuzzy
@@ -1494,7 +1581,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
#, fuzzy
msgid "options"
msgstr "Opciones"
@@ -1759,7 +1846,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
#, fuzzy
msgid "&apt-commonoptions;"
@@ -1769,8 +1856,8 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
#, fuzzy
msgid "Files"
msgstr "Ficheros"
@@ -1782,9 +1869,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1831,7 +1918,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
#, fuzzy
msgid "Diagnostics"
@@ -1975,7 +2062,7 @@ msgstr ""
"option> una de las siguientes órdenes deben de estar presentes."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
#, fuzzy
msgid "Options"
msgstr "Opciones"
@@ -2257,7 +2344,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Sólo muestra el contenido del espacio de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -2821,7 +2908,7 @@ msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2936,20 +3023,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -3270,12 +3359,32 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
#, fuzzy
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--all-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+#, fuzzy
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>--all-versions</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -3284,27 +3393,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
#, fuzzy
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
@@ -3386,7 +3495,7 @@ msgstr ""
"dselect(8), aptitude, synaptic, gnome-apt and wajig."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
#, fuzzy
msgid "update"
msgstr "update"
@@ -3872,15 +3981,15 @@ msgstr "<option>--fix-broken</option>"
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"Intenta arreglar un sistema con dependencias actualmente rotas. Esta opción "
"usada conjuntamente con install/remove, puede omitir cualquier paquete para "
@@ -4246,7 +4355,7 @@ msgstr "<option>--purge</option>"
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
"Borra los archivos de configuración de todos los paquetes que sean "
@@ -4540,14 +4649,25 @@ msgstr "utilidad APT para administración del CDROM"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
+"<cmdsynopsis sepchar=\" \">\n"
+"<command>apt-cdrom</command>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom "
+"punto_de_montaje</replaceable></option></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de "
+"configuración</replaceable></option></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</"
+"replaceable></option></arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4555,18 +4675,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
#, fuzzy
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>fichero(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4574,123 +4694,141 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
#, fuzzy
msgid "del <replaceable>keyid</replaceable>"
msgstr "add <replaceable>fichero(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
#, fuzzy
msgid "export <replaceable>keyid</replaceable>"
msgstr "dotty <replaceable>paquete(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
#, fuzzy
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr "dotty <replaceable>paquete(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
#, fuzzy
msgid "adv"
msgstr "add"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
#, fuzzy
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/apt.conf</filename>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>fichero(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
#, fuzzy
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/apt.conf</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
#, fuzzy
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
@@ -5168,7 +5306,7 @@ msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -5190,32 +5328,59 @@ msgstr "Programa para la consulta de configuración de APT"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:40
-#, fuzzy
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> es el fichero principal de configuración del "
-"conjunto de herramientas APT, todas las herramientas hacen uso del fichero "
-"de configuración y un analizador común de sintaxis de la línea de órdenes "
-"para proporcionar un entorno uniforme. Cuando se inicia una utilidad APT, "
-"este leerá la configuración especificada en la variable de entorno "
-"<envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en "
-"<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de "
-"configuración principal especificado por <literal>Dir::Etc::main</literal>, "
-"finalmente aplicará las opciones de la línea de órdenes para reescribir la "
-"directrices de la configuración, posiblemente cargando incluso más ficheros "
-"de configuración."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+#, fuzzy
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+"Fichero de configuración de APT. Opción de Configuración: <literal>Dir::Etc::"
+"Main</literal>."
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
#, fuzzy
msgid ""
"The configuration file is organized in a tree with options organized into "
@@ -5231,7 +5396,7 @@ msgstr ""
"Las opciones no son heredadas de sus grupos padres."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5247,7 +5412,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, fuzzy, no-wrap
msgid ""
"APT {\n"
@@ -5267,7 +5432,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
#, fuzzy
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
@@ -5281,7 +5446,7 @@ msgstr ""
"punto y coma. <informalexample>"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, fuzzy, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
@@ -5290,7 +5455,7 @@ msgstr ""
"DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
#, fuzzy
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
@@ -5301,14 +5466,14 @@ msgstr ""
"entender su aspecto."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5318,7 +5483,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
#, fuzzy
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
@@ -5336,7 +5501,7 @@ msgstr ""
"para suprimir la lista de nombres."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5346,7 +5511,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
#, fuzzy
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
@@ -5364,7 +5529,7 @@ msgstr ""
"lista."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -5381,13 +5546,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
#, fuzzy
msgid "The APT Group"
msgstr "El grupo APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
#, fuzzy
msgid ""
"This group of options controls general APT behavior as well as holding the "
@@ -5397,13 +5562,13 @@ msgstr ""
"mantenimiento de las opciones para todas las utilidades."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
#, fuzzy
msgid "Architecture"
msgstr "Arquitectura"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
#, fuzzy
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
@@ -5415,12 +5580,12 @@ msgstr ""
"la arquitectura para la que ha sido compilado apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5429,13 +5594,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
#, fuzzy
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
#, fuzzy
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
@@ -5445,13 +5610,13 @@ msgstr ""
"problemas ignore paquetes retenidos cuando tome decisiones."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
#, fuzzy
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
#, fuzzy
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
@@ -5466,13 +5631,13 @@ msgstr ""
"para reinstalarlos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
#, fuzzy
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5488,13 +5653,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -5505,13 +5670,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
#, fuzzy
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
#, fuzzy
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
@@ -5529,13 +5694,13 @@ msgstr ""
"bash o cualquier otro del que dependan estos paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
#, fuzzy
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
#, fuzzy
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
@@ -5545,13 +5710,13 @@ msgstr ""
"la información disponible. Esto fija el tamaño de esa caché."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
#, fuzzy
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
#, fuzzy
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
@@ -5559,13 +5724,13 @@ msgstr ""
"esenciales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
#, fuzzy
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
#, fuzzy
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
@@ -5575,13 +5740,13 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
#, fuzzy
msgid "Cache"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
#, fuzzy
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
@@ -5591,13 +5756,13 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
#, fuzzy
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
#, fuzzy
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
@@ -5607,31 +5772,42 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
#, fuzzy
msgid "The Acquire Group"
msgstr "El grupo Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
#, fuzzy
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
#, fuzzy
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
@@ -5647,13 +5823,13 @@ msgstr ""
"será abierta una conexión por cada tipo de URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
#, fuzzy
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
#, fuzzy
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
@@ -5663,13 +5839,13 @@ msgstr ""
"los ficheros fallidos el número de veces dado."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
#, fuzzy
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
#, fuzzy
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
@@ -5679,13 +5855,13 @@ msgstr ""
"fuente se enlazarán a ser posible, en vez de copiarse. Por omisión es true."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
#, fuzzy
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
#, fuzzy
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -5703,7 +5879,7 @@ msgstr ""
"de entorno <envar>http_proxy</envar> modifica todas las preferencias."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
#, fuzzy
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
@@ -5728,7 +5904,7 @@ msgstr ""
"Nota: Squid 2.0.2 no soporta ninguna de estas opciones."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
#, fuzzy
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -5740,7 +5916,7 @@ msgstr ""
"realizar la conexión y para recibir datos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
#, fuzzy
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
@@ -5760,7 +5936,7 @@ msgstr ""
"necesiten esto violan el RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -5770,7 +5946,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -5778,13 +5954,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
#, fuzzy
msgid "https"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -5794,7 +5970,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -5815,13 +5991,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
#, fuzzy
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
#, fuzzy
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
@@ -5853,7 +6029,7 @@ msgstr ""
"de la URI correspondiente."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
#, fuzzy
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
@@ -5870,7 +6046,7 @@ msgstr ""
"fichero de configuración de muestra para ver ejemplos)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
#, fuzzy
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
@@ -5885,7 +6061,7 @@ msgstr ""
"eficiencia."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
#, fuzzy
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
@@ -5901,19 +6077,19 @@ msgstr ""
"la mayoría de los servidores FTP no soportan RFC2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
#, fuzzy
msgid "cdrom"
msgstr "apt-cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
#, fuzzy
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
@@ -5933,12 +6109,12 @@ msgstr ""
"antiguas). Respecto a la sintaxis se pone"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -5946,18 +6122,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -5969,19 +6145,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -5998,13 +6174,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6019,7 +6195,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6029,36 +6205,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6067,7 +6243,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -6076,7 +6252,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
#, fuzzy
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
@@ -6086,13 +6262,13 @@ msgstr ""
"paquetes y los manejadores de URI."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
#, fuzzy
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
#, fuzzy
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
@@ -6113,7 +6289,7 @@ msgstr ""
"filename> o <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
#, fuzzy
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
@@ -6135,7 +6311,7 @@ msgstr ""
"literal> el directorio predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
#, fuzzy
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
@@ -6152,7 +6328,7 @@ msgstr ""
"envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
#, fuzzy
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
@@ -6164,7 +6340,7 @@ msgstr ""
"esto se carga el fichero principal de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
#, fuzzy
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
@@ -6182,7 +6358,7 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6195,13 +6371,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
#, fuzzy
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
#, fuzzy
msgid ""
"When APT is used as a &dselect; method several configuration directives "
@@ -6213,13 +6389,13 @@ msgstr ""
"la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
#, fuzzy
msgid "Clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
#, fuzzy
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
@@ -6237,7 +6413,7 @@ msgstr ""
"descargar los paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
#, fuzzy
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
@@ -6247,13 +6423,13 @@ msgstr ""
"ordenes cuando se ejecuta en la fase de instalación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
#, fuzzy
msgid "Updateoptions"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
#, fuzzy
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
@@ -6263,13 +6439,13 @@ msgstr ""
"ordenes cuando se ejecuta en la fase de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
#, fuzzy
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
#, fuzzy
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
@@ -6279,13 +6455,13 @@ msgstr ""
"continuar. Por omisión sólo pregunta en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
#, fuzzy
msgid "How APT calls dpkg"
msgstr "Como APT llama a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
#, fuzzy
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
@@ -6295,7 +6471,7 @@ msgstr ""
"encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
#, fuzzy
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
@@ -6307,19 +6483,19 @@ msgstr ""
"como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
#, fuzzy
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
#, fuzzy
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
#, fuzzy
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
@@ -6333,13 +6509,13 @@ msgstr ""
"si alguna falla APT abortará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
#, fuzzy
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
#, fuzzy
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
@@ -6355,7 +6531,7 @@ msgstr ""
"todos los .deb que va ha instalar por la entrada estándar, uno por línea."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
#, fuzzy
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
@@ -6371,13 +6547,13 @@ msgstr ""
"dada a <literal>Pre-Install-Pkgs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
#, fuzzy
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
#, fuzzy
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
@@ -6387,13 +6563,13 @@ msgstr ""
"omisión es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
#, fuzzy
msgid "Build-options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
#, fuzzy
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
@@ -6404,12 +6580,12 @@ msgstr ""
"binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6424,7 +6600,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6434,7 +6610,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -6448,12 +6624,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -6465,12 +6641,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6486,12 +6662,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -6502,12 +6678,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6517,12 +6693,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6534,12 +6710,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6551,7 +6727,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -6565,12 +6741,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6579,13 +6755,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
#, fuzzy
msgid "Debug options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6596,7 +6772,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6604,7 +6780,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6612,7 +6788,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6622,120 +6798,120 @@ 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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -6743,99 +6919,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
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><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
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><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
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><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -6845,12 +7021,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -6867,96 +7043,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
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><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
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><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
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><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
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><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -6964,20 +7140,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
#, fuzzy
msgid ""
"&configureindex; is a configuration file showing example values for all "
@@ -6987,14 +7163,14 @@ msgstr ""
"los valores predeterminados para todas las opciones posibles."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
#, fuzzy
msgid "&file-aptconf;"
msgstr "apt-cdrom"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache; &apt-conf;"
@@ -7066,14 +7242,25 @@ msgstr ""
"listado primero en el fichero &sources-list;. El fichero de preferencias de "
"APT no modifica la elección del ejemplar, sólo la elección de la versión."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "¿Cómo asigna APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -7081,7 +7268,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -7089,7 +7276,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -7114,25 +7301,25 @@ msgstr ""
"(<filename>/etc/apt/apt.conf</filename>). Por ejemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
#, fuzzy
msgid "priority 100"
msgstr "prioridad 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "a la versión instalada (si existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
#, fuzzy
msgid "priority 500"
msgstr "prioridad 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -7141,13 +7328,13 @@ msgstr ""
"a la versión que ni está instalada ni pertenece a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
#, fuzzy
msgid "priority 990"
msgstr "prioridad 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -7156,7 +7343,7 @@ msgstr ""
"distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -7168,7 +7355,7 @@ msgstr ""
"Asigna:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -7179,7 +7366,7 @@ msgstr ""
"todas las versiones de los paquetes instalados y 500 al resto."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -7189,7 +7376,7 @@ msgstr ""
"determinar qué versión del paquete debe instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -7206,13 +7393,13 @@ msgstr ""
"ser peligroso)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instalar la versión de mayor prioridad."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -7222,7 +7409,7 @@ msgstr ""
"(esto es, la que tiene un número de versión mayor)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -7234,7 +7421,7 @@ msgstr ""
"<literal>--reinstall</literal> se instala la que no está instalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -7250,7 +7437,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -7265,7 +7452,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -7285,13 +7472,13 @@ msgstr ""
"mayor que la versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "El efecto de las preferencias sobre APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -7305,7 +7492,7 @@ msgstr ""
"registros pueden tener una o dos formas: una específica y otra general."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -7321,7 +7508,7 @@ msgstr ""
"\"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -7334,7 +7521,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -7350,7 +7537,7 @@ msgstr ""
"nombre de dominio."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -7362,7 +7549,7 @@ msgstr ""
"prioridad alta a todas las versiones disponibles desde un sitio local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7375,7 +7562,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -7392,7 +7579,7 @@ msgstr ""
"\"Debian\" o \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -7404,7 +7591,7 @@ msgstr ""
"Archivo \"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7417,7 +7604,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -7429,7 +7616,7 @@ msgstr ""
"Archivo \"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7442,7 +7629,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -7455,7 +7642,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7468,19 +7655,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -7490,13 +7677,13 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
#, fuzzy
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -7506,13 +7693,13 @@ msgstr ""
"que la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
#, fuzzy
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7523,13 +7710,13 @@ msgstr ""
"reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
#, fuzzy
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7539,13 +7726,13 @@ msgstr ""
"distribución o la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
#, fuzzy
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -7554,19 +7741,19 @@ msgstr ""
"la versión sólo se instala si no hay ninguna versión del paquete instalado."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
#, fuzzy
msgid "prevents the version from being installed"
msgstr "la versión nunca se instala."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -7577,7 +7764,7 @@ msgstr ""
"números enteros. Se interpretan (en general) del siguiente modo:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -7592,7 +7779,7 @@ msgstr ""
"prioridad de la versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -7602,7 +7789,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -7631,12 +7818,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -7652,7 +7839,7 @@ msgstr ""
"entonces se instala la versión5.8*."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -7664,7 +7851,7 @@ msgstr ""
"versiones, incluso sobre los pertenecientes a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -7678,7 +7865,7 @@ msgstr ""
"versión del paquete instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
@@ -7686,7 +7873,7 @@ msgstr ""
"distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -7698,31 +7885,31 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
#, fuzzy
msgid "gives the package name"
msgstr "Indica el nombre del paquete"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
#, fuzzy
msgid "gives the version number for the named package"
msgstr "Indica el número de versión del paquete"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -7744,13 +7931,13 @@ msgstr ""
"cada registro:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -7769,7 +7956,7 @@ msgstr ""
"preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -7777,13 +7964,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Component:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -7801,13 +7988,13 @@ msgstr ""
"preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -7824,7 +8011,7 @@ msgstr ""
"siguientes línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -7837,13 +8024,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -7862,7 +8049,7 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -7870,13 +8057,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -7890,7 +8077,7 @@ msgstr ""
"tendrá que poner la siguiente línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -7898,13 +8085,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -7918,7 +8105,7 @@ msgstr ""
"la siguiente línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -7926,7 +8113,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -7948,7 +8135,7 @@ msgstr ""
"<filename>Release</filename> son relevantes para las prioridades de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7974,13 +8161,13 @@ msgstr ""
"la distribución <literal>inestable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en un registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -7992,7 +8179,7 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8005,13 +8192,13 @@ msgstr ""
"una línea que empieze con <literal>Pin-Priority: release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
#, fuzzy
msgid "Tracking Stable"
msgstr "Siguiendo la distribución estable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8036,7 +8223,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -8051,8 +8238,8 @@ msgstr ""
"de las distribuciones <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8065,7 +8252,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8079,13 +8266,13 @@ msgstr ""
"última versión <literal>estable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8098,13 +8285,13 @@ msgstr ""
"de nuevo amenos que se ejecute de nuevo la orden."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Siguiendo la distribución de pruebas o inestable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -8133,7 +8320,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -8150,7 +8337,7 @@ msgstr ""
"de <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8164,13 +8351,13 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8190,12 +8377,12 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8225,7 +8412,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8240,7 +8427,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8254,13 +8441,13 @@ msgstr ""
"última versión <literal>estable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8280,13 +8467,13 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
@@ -8630,7 +8817,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -8638,9 +8825,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -8899,7 +9086,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -9048,8 +9235,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"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 "
@@ -9137,7 +9324,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -9615,7 +9802,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -9714,8 +9901,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
#. type: <example></example>
@@ -9732,9 +9919,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
@@ -9867,6 +10054,34 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "<filename>apt.conf</filename> es el fichero principal de configuración "
+#~ "del conjunto de herramientas APT, todas las herramientas hacen uso del "
+#~ "fichero de configuración y un analizador común de sintaxis de la línea de "
+#~ "órdenes para proporcionar un entorno uniforme. Cuando se inicia una "
+#~ "utilidad APT, este leerá la configuración especificada en la variable de "
+#~ "entorno <envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en "
+#~ "<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de "
+#~ "configuración principal especificado por <literal>Dir::Etc::main</"
+#~ "literal>, finalmente aplicará las opciones de la línea de órdenes para "
+#~ "reescribir la directrices de la configuración, posiblemente cargando "
+#~ "incluso más ficheros de configuración."
+
+#, fuzzy
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
+
+#, fuzzy
#~ msgid "/usr/share/doc/apt/"
#~ msgstr "/usr/share/doc/apt/"
@@ -10138,14 +10353,6 @@ msgstr ""
#~ "<arg rep=\"norepeat\" choice=\"opt\">autoclean</arg>"
#, fuzzy
-#~ msgid ""
-#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-#~ "literal>."
-#~ msgstr ""
-#~ "Fichero de configuración de APT. Opción de Configuración: <literal>Dir::"
-#~ "Etc::Main</literal>."
-
-#, fuzzy
#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 49dc38f7f..a6d12364e 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -5,12 +5,12 @@
# Translators:
# Jérôme Marant, 2000.
# Philippe Batailler, 2005.
-# Christian Perrier <bubulle@debian.org>, 2009.
+# Christian Perrier <bubulle@debian.org>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
-"PO-Revision-Date: 2009-09-26 19:25+0200\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"PO-Revision-Date: 2010-01-29 19:58+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -74,8 +74,8 @@ msgid ""
"options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT est un système de gestion de paquets logiciels. Pour la gestion au "
-"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) à "
-"la ligne de commande ou B<synaptic>(8) pour X Window. Cependant, certaines "
+"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en "
+"ligne de commande ou B<synaptic>(8) pour X Window. Cependant, certaines "
"options ne sont disponibles que dans B<apt-get>(8)."
#. type: SH
@@ -114,14 +114,14 @@ msgstr ""
#: apt.8:42
#, no-wrap
msgid "DIAGNOSTICS"
-msgstr "DIAGNOSTIQUE"
+msgstr "DIAGNOSTICS"
#. type: Plain text
#: apt.8:44
msgid "apt returns zero on normal operation, decimal 100 on error."
msgstr ""
-"apt-get renvoie zéro après une opération normale et la valeur décimale 100 "
-"en cas d'erreur."
+"apt renvoie zéro après une opération normale et la valeur décimale 100 en "
+"cas d'erreur."
#. type: SH
#: apt.8:44
@@ -141,7 +141,7 @@ msgid ""
"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
"B<reportbug>(1) command."
msgstr ""
-"Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez remonter un "
+"Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
"bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting.txt> "
"ou utiliser la commande B<reportbug>(1)."
@@ -358,13 +358,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
@@ -374,7 +368,7 @@ msgid ""
msgstr ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -412,13 +406,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
@@ -428,19 +416,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
@@ -450,19 +432,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
@@ -472,7 +448,7 @@ msgid ""
msgstr ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -765,7 +741,7 @@ msgstr ""
"<!ENTITY manbugs \"\n"
" <refsect1><title>Bogues</title>\n"
" <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
-" Si vous souhaitez remonter un bogue à propos d'APT, veuillez lire\n"
+" Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
" <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
" la commande &reportbug;.\n"
" </para>\n"
@@ -854,7 +830,7 @@ msgstr ""
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
-" Les programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
+" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
" Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n"
" </para>\n"
" </listitem>\n"
@@ -942,7 +918,7 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>/etc/apt/apt.conf.D/</filename></term>\n"
" <listitem><para>Fragments du fichier de configuration d'APT.\n"
-" Élément de configuration : <literal>Dir::Etc::Partsn</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -1011,7 +987,7 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>Fragments de fichiers pour la préférence des versions.\n"
-" Élémet de configuration: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -1028,7 +1004,7 @@ msgstr ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Emplacement pour la récupération des paquets.\n"
-" Élément de configuration: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -1061,11 +1037,11 @@ msgstr ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
" <listitem><para>Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
-" Élément de configuration: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1076,11 +1052,97 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Zone de stockage pour les informations en transit.\n"
-" Élément de configuration : <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+#| msgid ""
+#| "<!ENTITY file-sourceslist \"\n"
+#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+#| " <listitem><para>Locations to fetch packages from.\n"
+#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
+" Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, no-wrap
+#| msgid ""
+#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+#| " <listitem><para>File fragments for locations to fetch packages from.\n"
+#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+#| " </varlistentry>\n"
+#| "\">\n"
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
+" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
-#. The last update date
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"Traducteurs\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, 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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
+" Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-english \"\n"
+" Veuillez noter que cette traduction peut contenir des parties non traduites\n"
+" Cela est volontaire, pour éviter de perdre du contenu quand la\n"
+" traduction est légèrement en retard sur le contenu d'origine.\n"
+"\">\n"
+
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -1163,7 +1225,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1379,13 +1441,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1397,7 +1452,7 @@ msgstr ""
"dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants "
"peuvent être mis en évidence quand on n'accède pas à une distribution "
"complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. "
-"Habituellement on les trouve dans les champs « Conflicts »."
+"Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:159
@@ -1451,7 +1506,7 @@ msgid ""
"It is primarily for debugging."
msgstr ""
"La commande <literal>dump</literal> affiche un court résumé sur chaque "
-"paquet du cache. Elle est d'abord destinée au débogage."
+"paquet du cache. Elle est d'abord destinée au débogage."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:184
@@ -1519,11 +1574,11 @@ msgstr ""
"La commande <literal>search</literal> recherche l'expression rationnelle "
"donnée en paramètre sur tous les paquets disponibles. Elle cherche une "
"occurrence de la chaîne dans les noms de paquets et dans les descriptions "
-"puis elle affiche le nom du paquet et sa description courte. Quand on donne "
-"l'option <option>--full</option>, la sortie est identique à <literal>show</"
-"literal> pour chaque paquet ; l'option <option>--names-only</option> ne "
-"recherche pas la chaîne dans les descriptions longues mais seulement dans "
-"les noms de paquets."
+"puis elle affiche le nom du paquet et sa description courte. Quand l'option "
+"<option>--full</option> est fournie, la sortie est identique à "
+"<literal>show</literal> pour chaque paquet ; l'option <option>--names-only</"
+"option> ne recherche pas la chaîne dans les descriptions longues mais "
+"seulement dans les noms de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:214
@@ -1532,7 +1587,7 @@ msgid ""
"and'ed together."
msgstr ""
"On peut utiliser des arguments distincts pour indiquer des expressions "
-"rationnelles différentes sur lesquelles sera réalisé un « et » logique."
+"rationnelles différentes sur lesquelles seront réalisées un « et » logique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:218
@@ -1585,11 +1640,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
-#, fuzzy
-#| msgid ""
-#| "Note that a package which APT knows of is not nessasarily available to "
-#| "download, installable or installed, e.g. virtual packages are also listed "
-#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1597,7 +1647,7 @@ msgid ""
msgstr ""
"Veuillez noter qu'un paquet connu par APT n'est pas forcément disponible, "
"installable ou installé. Par exemple, les paquets virtuels sont également "
-"affichés dans la liste."
+"affichés dans la liste créée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:239
@@ -1709,7 +1759,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "options"
@@ -1948,14 +1998,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr "Fichiers"
@@ -1966,9 +2016,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -1980,10 +2030,10 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
-msgstr "Diagnostique"
+msgstr "Diagnostics"
#. type: Content of: <refentry><refsect1><para>
#: apt-cache.8.xml:374
@@ -2110,7 +2160,7 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr "Options"
@@ -2360,7 +2410,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2388,8 +2438,8 @@ msgstr "1"
#: apt-extracttemplates.1.xml:30
msgid "Utility to extract DebConf config and templates from Debian packages"
msgstr ""
-"Outil d'extraction des textes de configuration pour DebConf dans un paquet "
-"Debian"
+"Outil d'extraction des textes et fichiers de configuration pour DebConf "
+"contenu dans un paquet Debian"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-extracttemplates.1.xml:36
@@ -2450,18 +2500,13 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <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 ""
-"Répertoire temporaire dans lequel écrire les scripts et guides de "
-"configuration pour Debconf. Élément de configuration : <literal>APT::"
+"Répertoire temporaire dans lequel écrire les scripts de configuration et "
+"modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::"
"ExtractTemplates::TempDir</literal>."
#. type: Content of: <refentry><refsect1><para>
@@ -2473,19 +2518,15 @@ msgstr ""
"<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
"le nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"Novembre 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"août 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
@@ -2601,8 +2642,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
-msgid ""
-"The option <option>--db</option> can be used to specify a binary caching DB."
+msgid "The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
"On peut se servir de l'option <option>--db</option> pour demander un cache "
"binaire."
@@ -2674,7 +2714,7 @@ msgid ""
"md5sum.txt files. It then writes to stdout a Release file containing an MD5 "
"digest and SHA1 digest for each file."
msgstr ""
-"La commande <literal>release</literal> crée un fichier Releases à partir "
+"La commande <literal>release</literal> crée un fichier « Releases » à partir "
"d'un répertoire. Elle cherche récursivement dans ce répertoire les fichiers "
"Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, "
"Release et md5sum.txt. Elle envoie alors un fichier Release sur la sortie "
@@ -2694,7 +2734,7 @@ msgstr ""
"La valeur des autres champs du fichier Release est tirée de la valeur "
"correspondante dans <literal>APT::FTPArchive::Release</literal>, p. ex. "
"<literal>APT::FTPArchive::Release::Origin</literal>. Les champs reconnus "
-"sont : <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</"
+"sont : <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>."
@@ -2757,10 +2797,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:155
-msgid ""
-"The generate configuration has 4 separate sections, each described below."
-msgstr ""
-"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
+msgid "The generate configuration has 4 separate sections, each described below."
+msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:157
@@ -2769,12 +2807,6 @@ msgstr "La section Dir"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2939,7 +2971,7 @@ msgid ""
"Links</literal> setting."
msgstr ""
"Indique le nombre de kilo-octets à délier (et à remplacer par des liens en "
-"dur) pour chaque exécution. On s'en sert, pour chaque section, avec le "
+"dur) pour chaque exécution. On s'en sert, pour chaque section, avec le "
"paramètre <literal>External-Links</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2987,7 +3019,7 @@ msgid ""
"be rebuilt."
msgstr ""
"Indique le nombre de kilo-octets de fichiers « Contents » qui sont créés "
-"chaque jour. Les fichiers « Contents » sont tirés au sort selon le système "
+"chaque jour. Les fichiers « Contents » sont choisis selon le système "
"<emphasis>round-robin</emphasis> de manière que, sur plusieurs jours, tous "
"soient reconstruits."
@@ -3063,11 +3095,14 @@ msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
+#| msgid ""
+#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+#| "source/Sources</filename>"
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Indique le fichier « Packages » crée. Par défaut, c'est <filename>$(DIST)/"
+"Indique le fichier « Sources » créé. Par défaut, c'est <filename>$(DIST)/"
"$(SECTION)/source/Sources</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -3205,26 +3240,37 @@ msgstr ""
"peuvent s'utiliser dans la section <literal>Tree</literal> ainsi que les "
"trois nouvelles variables suivantes."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"Quand il exécute la section <literal>Tree</literal>, <command>apt-"
-"ftparchive</command> agit ainsi :"
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
+#| msgid ""
+#| "for i in Sections do \n"
+#| " for j in Architectures do\n"
+#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
msgstr ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+#| msgid ""
+#| "When processing a <literal>Tree</literal> section <command>apt-"
+#| "ftparchive</command> performs an operation similar to:"
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"Quand il exécute la section <literal>Tree</literal>, <command>apt-"
+"ftparchive</command> effectue une opération analogue à : <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
@@ -3254,9 +3300,9 @@ msgid ""
"search section. The special architecture 'source' is used to indicate that "
"this tree has a source archive."
msgstr ""
-"C'est une liste de toutes les architectures qui appartiennent à chaque "
-"section. L'architecture spéciale « source » indique que l'arborescence est "
-"une arborescence de sources."
+"C'est une liste de toutes les architectures séparées par des espaces qui "
+"appartiennent à chaque section. L'architecture spéciale « source » indique "
+"que l'arborescence est une arborescence de sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
@@ -3506,7 +3552,7 @@ msgstr ""
"l'enregistrement dans un fichier-journal en omettant les indicateurs de "
"progression. Un plus grand nombre de « q » (2 au plus) produit un plus grand "
"silence. On peut aussi utiliser <option>-q=#</option> pour positionner le "
-"niveau de silence, et annuler le fichier de configuration. Élément de "
+"niveau de silence, et annuler le fichier de configuration. Élément de "
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3582,34 +3628,58 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
#, fuzzy
-#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
+#| msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
"that it is currently not possible to create these files with <command>apt-"
"ftparchive</command>."
msgstr ""
+"Cette option de configuration a « <literal>true</literal> » comme valeur par "
+"défaut et ne devrait être placée sur « <literal>false</literal> » que si "
+"l'archive créée avec &apt-ftparchive; fournit également des fichiers "
+"<filename>Translation</filename>. Veuillez noter qu'il n'est actuellement "
+"pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3618,7 +3688,7 @@ msgstr ""
"paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3626,7 +3696,7 @@ msgstr ""
"<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
"nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-get.8.xml:13
msgid ""
@@ -3644,9 +3714,7 @@ msgstr "apt-get"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-get.8.xml:30
msgid "APT package handling utility -- command-line interface"
-msgstr ""
-"Utilitaire APT pour la manipulation de paquets -- interface en ligne de "
-"commande."
+msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
@@ -3721,13 +3789,13 @@ msgid ""
"library. Several \"front-end\" interfaces exist, such as &dselect;, "
"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
msgstr ""
-"<command>Apt-get</command> est l'outil en ligne de commande pour manipuler "
-"les paquets. Il peut être considéré comme l'outil de base (« backend ») pour "
-"les autres outils de la bibliothèque APT. Plusieurs interfaces utilisateur "
+"<command>Apt-get</command> est le programme en ligne de commande pour la "
+"gestion des paquets. Il peut être considéré comme l'outil de base pour les "
+"autres programmes de la bibliothèque APT. Plusieurs interfaces utilisateur "
"existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr "update"
@@ -3750,7 +3818,7 @@ msgstr ""
"filename>. Ainsi, lorsqu'on utilise une archive Debian, cette commande "
"récupère les fichiers <filename>Packages.gz</filename> et les analyse de "
"manière à rendre disponibles les informations concernant les nouveaux "
-"paquets et les paquets mis à jour. On doit toujours exécuter une commande "
+"paquets et les paquets mis à jour. On doit toujours exécuter une commande "
"<literal>update</literal> avant les commandes <literal>upgrade</literal> ou "
"<literal>dist-upgrade</literal>. Veuillez noter que l'indicateur de "
"progression d'ensemble peut être imprécis puisque la taille de ces fichiers "
@@ -3803,12 +3871,12 @@ msgid ""
"new packages)."
msgstr ""
"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
-"&dselect;, l'interface originelle Debian pour la gestion des paquets. La "
-"commande <literal>dselect-upgrade</literal> suit les modifications faites "
-"par &dselect; dans le champ <literal>Status</literal> des paquets "
-"disponibles, et effectue les actions nécessaires à la réalisation de cet "
-"état (par exemple, suppression d'anciens paquets, installation de nouveaux "
-"paquets)."
+"&dselect;, la plus ancienne interface du projet Debian pour la gestion des "
+"paquets. La commande <literal>dselect-upgrade</literal> suit les "
+"modifications faites par &dselect; dans le champ <literal>Status</literal> "
+"des paquets disponibles, et effectue les actions nécessaires à la "
+"réalisation de cet état (par exemple, suppression d'anciens paquets, "
+"installation de nouveaux paquets)."
#. type: <tag></tag>
#: apt-get.8.xml:170 guide.sgml:140
@@ -3833,7 +3901,7 @@ msgstr ""
"changements de dépendances dans les nouvelles versions des paquets ; "
"<command>apt-get</command> possède un système « intelligent » de résolution "
"des conflits et il essaye, quand c'est nécessaire, de mettre à niveau les "
-"paquets les plus importants aux dépens des paquets les moins importants. Le "
+"paquets les plus importants avant les paquets les moins importants. Le "
"fichier <filename>/etc/apt/sources.list</filename> contient une liste de "
"sources où récupérer les paquets désirés. Voyez aussi &apt-preferences; pour "
"un mécanisme de remplacement des paramètres généraux pour certains paquets."
@@ -3911,9 +3979,9 @@ msgid ""
msgstr ""
"Cette méthode est aussi utile pour mettre à jour un ou plusieurs paquets "
"déjà installés sans mettre à jour les autres paquets du système. À la "
-"différence de la commande « upgrade » qui installera le dernière version "
-"disponible de tous les paquets installés au moment de son exécution, « "
-"install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué"
+"différence de la commande « upgrade » qui installera la dernière version "
+"disponible de tous les paquets installés au moment de son exécution, "
+"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué"
"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une "
"nouvelle version est disponible, cette version (et ses dépendances, comme "
"décrit plus haut) sera récupérée et installée."
@@ -3982,7 +4050,7 @@ msgid ""
"too)."
msgstr ""
"La commande <literal>purge</literal> est identique à <literal>remove</"
-"literal> mais les paquets indiqués sont supprimés et purgés (leur fichiers "
+"literal> mais les paquets indiqués sont supprimés et purgés (leurs fichiers "
"de configuration sont également effacés)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3992,15 +4060,6 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
-#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package while "
-#| "respect the default release, set with the option <literal>APT::Default-"
-#| "Release</literal>, the <option>-t</option> option or per package with "
-#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4011,16 +4070,16 @@ msgid ""
"<literal>pkg/release</literal> syntax, if possible."
msgstr ""
"Avec la commande <literal>source</literal>, <command>apt-get</command> "
-"récupère des paquets sources. APT examine les paquets disponibles pour "
-"choisir le paquet source à récupérer. Il trouve ensuite et récupère dans le "
-"répertoire courant leur version la plus récente par rapport à la version "
-"cible par défaut établie avec l'option <literal>APT::Default-Release</"
-"literal>, l'option <option>-t</option> ou par paquet avec la syntaxe "
-"<literal>paquet/version</literal>, si possible."
+"récupère des paquets source. APT examine les paquets disponibles pour "
+"choisir le paquet source à récupérer. Il télécharge ensuite dans le "
+"répertoire courant la version la plus récente du paquet, définie par rapport "
+"à la distribution par défaut établie soit avec l'option <literal>APT::"
+"Default-Release</literal>, soit avec l'option <option>-t</option> ou soit "
+"par paquet avec la syntaxe <literal>paquet/version</literal> \"\"\"while "
+"respect the default release\"\"\" me paraît douteux."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:259
-#, fuzzy
msgid ""
"Source packages are tracked separately from binary packages via <literal>deb-"
"src</literal> type lines in the &sources-list; file. This means that you "
@@ -4028,14 +4087,15 @@ msgid ""
"from. If you don't do this you will properly get another (newer, older or "
"none) source version than the one you have installed or could install."
msgstr ""
-"Les paquets source sont gérés indépendamment des paquets binaires, via les "
-"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On "
-"n'obtiendra probablement pas les mêmes sources que celles du paquet installé "
-"ou celles du paquet qu'on pourrait installer."
+"Les paquets source sont gérés indépendamment des paquets binaires, avec les "
+"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il "
+"est donc nécessaire d'ajouter une telle ligne pour chaque dépôt pour lequel "
+"vous souhaitez pouvoir obtenir les sources. Dans le cas contraire, vous "
+"n'obtiendrez pas les mêmes sources que celles du paquet que vous avez "
+"installé ou que vous voulez installer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
-#, fuzzy
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4068,7 +4128,7 @@ msgid ""
"only in the current directory and are similar to downloading source tar "
"balls."
msgstr ""
-"Veuillez noter que les paquets sources ne sont pas suivis comme le sont les "
+"Veuillez noter que les paquets source ne sont pas suivis comme le sont les "
"paquets binaires. Ils ne sont présents que dans le répertoire courant et "
"sont semblables à des sources téléchargées sous forme d'archives tar."
@@ -4099,7 +4159,7 @@ msgid ""
"and checks for broken dependencies."
msgstr ""
"La commande <literal>check</literal> est un outil de diagnostic ; il met à "
-"jour le cache des paquets et cherche des dépendances défectueuses."
+"jour le cache des paquets et cherche les dépendances défectueuses."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:293
@@ -4139,8 +4199,8 @@ msgstr ""
"Tout comme <literal>clean</literal>, <literal>autoclean</literal> nettoie le "
"référentiel local des paquets récupérés. La différence est qu'il supprime "
"uniquement les paquets qui ne peuvent plus être téléchargés et qui sont "
-"grandement inutiles. On peut ainsi contrôler la taille de ce cache sur une "
-"longue période. Tant qu'elle n'est pas activée, l'option de configuration "
+"inutiles. On peut ainsi contrôler la taille de ce cache sur une longue "
+"période. Tant qu'elle n'est pas activée, l'option de configuration "
"<literal>APT::Clean-Installed</literal> empêche la suppression de paquets "
"installés."
@@ -4196,31 +4256,44 @@ msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:334
+#, fuzzy
+#| msgid ""
+#| "Fix; attempt to correct a system with broken dependencies in place. This "
+#| "option, when used with install/remove, can omit any packages to permit "
+#| "APT to deduce a likely solution. Any Package that are specified must "
+#| "completely correct the problem. The option is sometimes necessary when "
+#| "running APT for the first time; APT itself does not allow broken package "
+#| "dependencies to exist on a system. It is possible that a system's "
+#| "dependency structure can be so corrupt as to require manual intervention "
+#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
+#| "to eliminate some of the offending packages). Use of this option together "
+#| "with <option>-m</option> may produce an error in some situations. "
+#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
-msgstr ""
-"Correction ; essaye de réparer un système dont les dépendances sont "
-"défectueuses. Cette option, utilisée avec install ou remove, peut omettre "
-"tout paquet de façon à permettre à APT de déduire une solution viable. "
-"Chaque paquet spécifié doit complètement corriger le problème. Cette option "
-"est quelquefois nécessaire lorsque l'on exécute APT pour la première fois ; "
-"APT lui-même interdit les dépendances défectueuses dans un système. Il est "
-"possible que la structure de dépendances d'un système soit tellement "
-"corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la "
-"plupart du temps utiliser &dselect; ou <command>dpkg --remove</command> pour "
-"éliminer les paquets en cause). L'utilisation de cette option conjointement "
-"avec <option>-m</option> peut produire une erreur dans certaines situations. "
-"Élément de configuration : <literal>APT::Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
+msgstr ""
+"Correction ; cette option demande de réparer un système où existent des "
+"dépendances défectueuses. Utilisée avec install ou remove, elle peut exclure "
+"un paquet pour permettre de déduire une solution viable. Tout paquet "
+"spécifié doit complètement corriger le problème. Cette option est "
+"quelquefois nécessaire lorsque l'on exécute APT pour la première fois ; APT "
+"interdit les dépendances défectueuses dans un système. Il est possible que "
+"la structure de dépendances d'un système soit tellement corrompue qu'elle "
+"requiert une intervention manuelle (ce qui veut dire la plupart du temps "
+"utiliser &dselect; ou <command>dpkg --remove</command> pour éliminer les "
+"paquets en cause). L'utilisation de cette option conjointement avec <option>-"
+"m</option> peut produire une erreur dans certaines situations. Élément de "
+"configuration : <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:347
@@ -4308,21 +4381,12 @@ msgid ""
"actually change the system. Configuration Item: <literal>APT::Get::"
"Simulate</literal>."
msgstr ""
-"Pas d'action ; simule les événements qui devraient se produire sans "
+"Pas d'action ; simule les événements qui devraient se produire sans "
"effectuer de changement réel sur le système. Élément de configuration : "
"<literal>APT::Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
-#, fuzzy
-#| msgid ""
-#| "Simulation run as user will deactivate locking (<literal>Debug::"
-#| "NoLocking</literal>) automatical. Also a notice will be displayed "
-#| "indicating that this is only a simulation, if the option <literal>APT::"
-#| "Get::Show-User-Simulation-Note</literal> is set (Default: true) Neigther "
-#| "NoLocking nor the notice will be triggered if run as root (root should "
-#| "know what he is doing without further warnings by <literal>apt-get</"
-#| "literal>)."
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4331,23 +4395,17 @@ msgid ""
"will be triggered if run as root (root should know what he is doing without "
"further warnings by <literal>apt-get</literal>)."
msgstr ""
-"Lorsque la simulation est effectuée par un utilisateur sans privilèges, le "
+"Lorsque la simulation est effectuée par un utilisateur sans privilège, le "
"verrouillage (<literal>Debug::NoLocking</literal>) sera désactivé "
-"automatiquement. Une mention explicite qu'il s'agit d'une simple simulation "
-"sera affichée si l'option <literal>APT::Get::Show-User-Simulation-Note</"
-"literal> est activée (elle est active par défaut). Ni la désactivation du "
-"verrou ni l'affichage de la mention de simulation ne seront utilisées si la "
-"commande est lancée par l'utilisateur root (pour qui il n'est pas jugé utile "
-"qu'<literal>apt-get</literal> envoie de telles notifications)."
+"automatiquement. Une mention explicite indiquant qu'il s'agit d'une simple "
+"simulation sera affichée si l'option <literal>APT::Get::Show-User-Simulation-"
+"Note</literal> est activée (elle est active par défaut). Ni la désactivation "
+"du verrou ni l'affichage de la mention de simulation ne seront déclenchées "
+"si la commande est lancée par l'utilisateur root (pour qui il n'est pas jugé "
+"utile qu'<literal>apt-get</literal> envoie de telles notifications)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4355,7 +4413,7 @@ msgid ""
"that are of no consequence (rare)."
msgstr ""
"La simulation affiche une série de lignes représentant chacune une opération "
-"de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets "
+"de dpkg, Configure (Conf), Remove (Remv), Unpack (Inst). Des crochets "
"encadrent des paquets endommagés et des crochets n'encadrant rien indiquent "
"que les dommages n'ont aucune conséquence (rare)."
@@ -4560,14 +4618,21 @@ msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:467
+#, fuzzy
+#| msgid ""
+#| "Use purge instead of remove for anything that would be removed. An "
+#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
+#| "to be purged. <option>remove --purge</option> is equivalent for "
+#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
+#| "Purge</literal>."
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
"Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut "
-"être supprimé. Une astérisque (*) sera affichée près des paquets qui vont "
+"être supprimé. Un astérisque (*) sera accolé aux noms des paquets qui vont "
"être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4632,7 +4697,7 @@ msgid ""
msgstr ""
"Cette option contrôle l'entrée par défaut pour les questions de "
"distribution ; une étiquette (pin) par défaut dont la priorité vaut 990 est "
-"créé en utilisant la chaîne spécifiée. Le fichier des préférences peut "
+"créée en utilisant la chaîne spécifiée. Le fichier des préférences peut "
"annuler cette décision. En clair, cette option permet de contrôler "
"simplement dans quelle distribution seront récupérés les paquets. Par "
"exemple : <option>-t '2.1*'</option>, <option>-t unstable</option> ou "
@@ -4770,8 +4835,8 @@ msgid ""
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
"AllowUnauthenticated</literal>."
msgstr ""
-"Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas "
-"d'interrogation de l'utilisateur. Cette option est très utile pour certains "
+"Ignorer le fait que les paquets ne peuvent pas être authentifiés ; ne le "
+"signale pas à l'utilisateur. Cette option est très utile pour certains "
"outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
"AllowUnauthenticated</literal>."
@@ -4781,6 +4846,8 @@ msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:570
@@ -4834,8 +4901,14 @@ msgstr "Utilitaire de gestion des clés d'APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#| "option></arg>"
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
@@ -4844,7 +4917,7 @@ msgstr ""
"arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4854,17 +4927,17 @@ msgstr ""
"les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr "Commandes"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4875,71 +4948,71 @@ msgstr ""
"<replaceable>fichier</replaceable> est <literal>-</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>clé</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr "Supprimer une clé de la liste des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>clé</replaceable>"
+msgstr "export <replaceable>clé</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr "exportall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
-msgstr "Affichier toutes les clés fiables sur la sortie standard."
+msgstr "Afficher toutes les clés fiables sur la sortie standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr "list"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr "Afficher la liste des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr "finger"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr "Afficher les empreintes des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
-"Passer des opétions avancées à gpg. Avec la commande adv --recv-key, il est "
+"Passer des options avancées à gpg. Avec la commande adv --recv-key, il est "
"possible de télécharger une clé publique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -4947,67 +5020,80 @@ msgstr ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive Debian et supprimer les clés qui y sont périmées."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+#, fuzzy
+#| msgid "add <replaceable>filename</replaceable>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
-"Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
-msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
-msgstr ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+#: apt-key.8.xml:166
+msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"Novembre 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"août 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-mark.8.xml:22 apt-mark.8.xml:29
@@ -5017,16 +5103,10 @@ msgstr "apt-mark"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-mark.8.xml:30
msgid "mark/unmark a package as being automatically-installed"
-msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement"
+msgstr "Indiquer si un paquet a été installé automatiquement ou non"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5035,10 +5115,12 @@ msgid ""
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
-"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"req"
-"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquet</replaceable></arg>"
+" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
+"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> "
+"<arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg> </"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:53
@@ -5046,18 +5128,11 @@ msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
-"<command>apt-mark</command> changera l'indication selon laquelle un paquet a "
-"été automatiquement installé."
+"Avec la commande <command>apt-mark</command>, on peut indiquer si un paquet "
+"a été automatiquement installé ou pas."
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
-#, fuzzy
-#| msgid ""
-#| "When you request that a package is installed, and as a result other "
-#| "packages are installed to satisfy its dependencies, the dependencies are "
-#| "marked as being automatically installed. Once these automatically "
-#| "installed packages are no longer depended on by any manually installed "
-#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5065,10 +5140,12 @@ msgid ""
"are no longer depended on by any manually installed packages, they will be "
"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
-"Lorsque l'installation d'un paquet est demandée et que d'autres paquets dont "
-"il dépend sont installés, ces paquets sont marqués comme ayant été "
-"automatiquement installés. De tels paquets sont supprimés dès que plus aucun "
-"paquet, installé manuellement, qui dépend d'eux ne subsiste sur le système."
+"Lorsque l'installation d'un paquet est demandée et que par voie de "
+"dépendances d'autres paquets sont installés, ces paquets sont marqués comme "
+"ayant été automatiquement installés. Une fois que ces paquets "
+"automatiquement installés ne sont plus liés à un paquet existant, ils seront "
+"supprimés par un appel à <command>apt-get</command> ou <command>aptitude</"
+"command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:65
@@ -5105,58 +5182,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:81
msgid "showauto"
-msgstr ""
+msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
-#| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
msgstr ""
-"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
-"installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
-"ne sont plus nécessaires."
+"<literal>showauto</literal>, affiche les paquets installés manuellement, un "
+"paquet par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
-#, fuzzy
-#| msgid "<option>-f=<filename>FILENAME</filename></option>"
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr "<option>-f=<filename>FICHIER</filename></option>"
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
-#, fuzzy
-#| msgid "<option>--file=<filename>FILENAME</filename></option>"
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
-msgstr "<option>--file=<filename>FICHIER</filename></option>"
+msgstr ""
+"<option>--file=<filename><replaceable>FICHIER</replaceable></filename></"
+"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
-#, fuzzy
-#| msgid ""
-#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
-#| "the default location, which is <filename>extended_status</filename> in "
-#| "the directory defined by the Configuration Item: <literal>Dir::State</"
-#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
-"Lire/écrire les statistiques sur les paquets depuis <filename>FICHIER</"
-"filename> au lieu de l'emplacement par défaut (<filename>extended_status</"
-"filename> dans le répertoire défini par l'option de configuration "
-"<literal>Dir::State</literal>."
+"Lecture/écriture des statistiques d'un paquet dans "
+"<filename><replaceable>FICHIER</replaceable></filename> au lieu du fichier "
+"par défaut (<filename>extended_status</filename> dans le répertoire défini "
+"par l'élément de configuration <literal>Dir::State</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:103
@@ -5171,7 +5233,7 @@ msgstr "<option>--help</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:105
msgid "Show a short usage summary."
-msgstr "Affiche un résumé de la méthode d'utilisation"
+msgstr "Affiche un résumé de l'aide"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:111
@@ -5186,14 +5248,12 @@ msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:113
msgid "Show the program version."
-msgstr "Afficher la version du programme."
+msgstr "Affiche la version du programme."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:124
-#, fuzzy
-#| msgid "<filename>/etc/apt/preferences</filename>"
msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
+msgstr "<filename>/var/lib/apt/extended_states</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:125
@@ -5202,13 +5262,14 @@ msgid ""
"State</literal> sets the path to the <filename>extended_states</filename> "
"file."
msgstr ""
+"États des paquets automatiquement installés. L'élément de configuration "
+"<literal>Dir::State</literal> définit le chemin d'accès au fichier "
+"<filename>extended_states</filename>."
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:134
-#, fuzzy
-#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
+msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:138
@@ -5216,8 +5277,8 @@ msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
msgstr ""
-"<command>apt-mark</command> retourne zéro après un déroulement normal, et le "
-"nombre décimal 100 en cas d'erreur."
+"<command>apt-mark</command> retourne zéro après un déroulement normal, et un "
+"autre chiffre en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refname>
#: apt-secure.8.xml:14 apt-secure.8.xml:36
@@ -5274,14 +5335,6 @@ msgstr "Trusted archives"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -5330,15 +5383,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5347,12 +5391,12 @@ msgid ""
"by the archive key (which is created once a year) and distributed through "
"the FTP server. This key is also on the Debian keyring."
msgstr ""
-"Une fois le paquet vérifié et archivé, la signature du responsable est "
-"enlevée, une somme MD5 du paquet est calculée et mise dans le fichier "
-"Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise "
-"dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette "
-"clé qui est créée chaque année et distribuée par le serveur FTP se trouve "
-"aussi dans le trousseau Debian."
+"Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la "
+"signature du responsable est enlevée, une somme MD5 du paquet est calculée "
+"et mise dans le fichier Packages. Une somme MD5 de tous les paquets est "
+"ensuite calculée et mise dans le fichier Release. Ce fichier est signé par "
+"la clé de l'archive. Cette clé, qui est recréée chaque année, est distribuée "
+"par le serveur FTP. Elle se trouve aussi dans le trousseau Debian."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:102
@@ -5413,7 +5457,7 @@ msgid ""
"sign the Release files. In any case, this mechanism can complement a per-"
"package signature."
msgstr ""
-"Cependant cette méthode ne garantit pas contre une compromission du serveur "
+"Cependant cette méthode ne protège pas contre une compromission du serveur "
"Debian lui-même (qui signe les paquets) ni contre la compromission de la clé "
"qui sert à signer les fichiers Release. Mais elle peut compléter la "
"signature des paquets."
@@ -5467,48 +5511,34 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
-"<literal>créer un fichier Release à la racine de l'archive</literal>, s'il "
+"<emphasis>créer un fichier Release à la racine de l'archive</emphasis>, s'il "
"n'existe pas déjà. Vous pouvez le créer avec la commande <command>apt-"
-"ftparchive release</command> (fournie dans le paquet apt-utils) ;"
+"ftparchive release</command> (fournie dans le paquet apt-utils)."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
"o Release.gpg Release</command>."
msgstr ""
-"<literal>le signer</literal>, avec la commande <command>gpg -abs -o Release."
-"gpg Release</command> ;"
+"<emphasis>le signer</emphasis>, avec la commande <command>gpg -abs -o "
+"Release.gpg Release</command>."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
-"<literal>publier l'empreinte de la clé</literal>. Ainsi les utilisateurs de "
-"votre archive connaîtront la clé qu'ils doivent importer pour authentifier "
-"les fichiers de l'archive."
+"<emphasis>publier l'empreinte de la clé</emphasis>. Ainsi les utilisateurs "
+"de votre archive connaîtront la clé qu'ils doivent importer pour "
+"authentifier les fichiers de l'archive."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:175
@@ -5626,7 +5656,7 @@ msgstr ""
"<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
"en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
#, fuzzy
@@ -5634,17 +5664,17 @@ msgstr ""
#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>10 December 2008</date>"
+#| "email; &apt-product; <date>18 September 2009</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>10 décembre 2008</date>"
+"&apt-product; <date>18 septembre 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt.conf.5.xml:28 apt.conf.5.xml:35
@@ -5665,36 +5695,59 @@ msgstr "Fichier de configuration pour APT"
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"Le fichier <filename>apt.conf</filename> est le principal fichier de "
-"configuration de la collection d'outils que constitue APT ; tous les outils "
-"font appel à ce fichier de configuration et utilisent un analyseur "
-"syntaxique en ligne de commande commun afin de fournir un environnement "
-"uniforme. Quand un outil d'APT démarre, il lit la configuration désignée par "
-"variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), puis il "
-"lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> ainsi que le "
-"principal fichier de configuration indiqué par <literal>Dir::Etc::main</"
-"literal> ; enfin il applique les options de la ligne de commande qui "
-"prévalent sur les directives de configuration, chargeant si nécessaire "
-"d'autres fichiers de configuration."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
#, fuzzy
#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
+#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
+#| "literal>."
+msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+"Fichier de configuration d'APT. Élément de configuration : <literal>Dir::"
+"Etc::Main</literal>."
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -5709,16 +5762,7 @@ msgstr ""
"Get. Il n'y a pas d'héritage des options des groupes parents."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
-#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5738,12 +5782,17 @@ msgstr ""
"ignorée, de même que les sections de texte placées entre <literal>/*</"
"literal> et <literal>*/</literal>, tout comme les commentaires C/C++. "
"Chaque ligne est de la forme : <literal>APT::Get::Assume-Yes \"true\";</"
-"literal> Le point-virgule final est obligatoire et les guillemets sont "
-"optionnels. On peut déclarer un nouveau champ d'action avec des accolades, "
-"comme suit :"
+"literal>. Le point-virgule final est obligatoire et les guillemets sont "
+"optionnels. La valeur doit tenir sur une seule ligne et il n'existe pas de "
+"fusion de chaînes. Elle ne doit pas comporter de guillemets. Le comportement "
+"du caractère barre oblique inversée \"\\\" et les caractères utilisés avec "
+"séquence d'échappement dans une valeur ne sont pas déterministes et "
+"devraient être évités. Le nom d'une option peut contenir des caractères "
+"alphanumériques et « /-:._+ ». On peut déclarer un nouveau champ d'action "
+"avec des accolades, comme suit :"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -5761,7 +5810,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5772,13 +5821,13 @@ msgstr ""
"guillemets suivie d'un point virgule pour chaque élément de la liste."
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -5788,7 +5837,7 @@ msgstr ""
"configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5798,7 +5847,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5806,17 +5855,15 @@ msgid ""
"list. If you specify a name you can override the option as every other "
"option by reassigning a new value to the option."
msgstr ""
+"Les noms des éléments de configuration sont optionnels si une liste est "
+"définie, comme cela peut se voir avec l'exemple <literal>DPkg::Pre-Install-"
+"Pkgs</literal> précédent. Si vous n'indiquez pas de nom, une nouvelle entrée "
+"ajoutera une nouvelle option à la liste. Dans le cas contraire, l'option "
+"correspondante peut être remplacée, comme toute autre option, en lui "
+"réaffectant une valeur."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal> <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendents are "
-#| "erased."
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5826,15 +5873,17 @@ msgid ""
"The specified element and all its descendants are erased. (Note that these "
"lines also need to end with a semicolon.)"
msgstr ""
-"Deux éléments spéciaux sont autorisés : <literal>#include</literal> et "
+"Deux éléments spéciaux sont autorisés : <literal>#include</literal> (qui est "
+"obsolète et n'est plus géré par des implémentations alternatives) et "
"<literal>#clear</literal>. <literal>#include</literal> inclut le fichier "
-"donné en argument, à moins que le nom ne se termine par une barre oblique "
+"donné en paramètre, à moins que le nom ne se termine par une barre oblique "
"auquel cas le répertoire entier est inclus. <literal>#clear</literal> sert à "
"effacer une partie de l'arbre de configuration. L'élément désigné et tout "
-"ses descendants sont supprimés."
+"ses descendants sont supprimés. Veuillez noter que ces lignes doivent "
+"également se terminer avec un point-virgule."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5842,16 +5891,15 @@ msgid ""
"overridden by addressing a new value to it - lists and scopes can't be "
"overridden, only cleared."
msgstr ""
+"La commande #clear est la seule façon de supprimer une liste ou un champ "
+"d'action (« scope »). La réouverture d'un scope ou le style « ::- » décrit "
+"plus loin ne remplaceront <emphasis>pas</emphasis> les entrées écrites "
+"précédemment. Seules les options peuvent être remplacées en leur assignant "
+"une nouvelle valeur. Les listes et les champs d'action ne peuvent être "
+"remplacés mais seulement effacés."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
-#, fuzzy
-#| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
-#| "configuration directive to be specified on the command line. The syntax "
-#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
-#| "instance) followed by an equals sign then the new value of the option. "
-#| "Lists can be appended too by adding a trailing :: to the list name."
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -5865,10 +5913,11 @@ msgstr ""
"syntaxe consiste en un nom complet d'option (par exemple <literal>APT::Get::"
"Assume-Yes</literal>) suivi par un signe égal, puis par la nouvelle valeur "
"de l'option. On peut compléter une liste en ajoutant un « :: » au nom de la "
-"liste."
+"liste. Comme on peut s'en douter, la syntaxe de champ d'action (« scope ») ne "
+"peut pas être indiquée à la ligne de commande."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -5883,14 +5932,28 @@ msgid ""
"correct such statements now as long as APT doesn't complain explicit about "
"them."
msgstr ""
+"Veuillez noter que vous ne pouvez utiliser « :: » que pour ajouter un élément "
+"par ligne à la liste et que cela ne devrait pas être utilisé en combinaison "
+"avec la syntaxe de champ d'action (« scope ») qui inclut implicitement « :: ». "
+"L'utilisation simultanée des deux syntaxes déclenchera un bogue dont "
+"certains utilisateurs se servent comme d'une fonctionnalité : une option "
+"avec le nom inhabituel « <literal>::</literal> » se comportera comme toute "
+"autre option nommée. Cela risque d'avoir de nombreux problèmes comme "
+"conséquence, par exemple si un utilisateur écrit plusieurs lignes avec cette "
+"syntaxe <emphasis>erronée</emphasis> afin de faire un ajout à la liste, "
+"l'effet obtenu sera inverse puisque seule la dernière valeur pour l'option "
+"« <literal>::</literal> » sera utilisée. Les futures versions d'APT "
+"retourneront une erreur et l'exécution sera interrompue si cette utilisation "
+"incorrecte est rencontrée. Il est donc conseillé de corriger ces défauts "
+"tant qu'APT ne s'en plaint pas explicitement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr "Le groupe APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5899,12 +5962,12 @@ msgstr ""
"également des options communes à tous les outils."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr "Architecture"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5915,12 +5978,12 @@ msgstr ""
"valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5930,15 +5993,15 @@ msgstr ""
"Indique la distribution à utiliser par défaut lors de l'installation d'un "
"paquet si plusieurs versions sont disponibles. La valeur peut être un nom de "
"distribution ou un numéro de version. Exemples : « stable », « testing », "
-"« 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
+"« lenny », « squeeze », « 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5948,12 +6011,12 @@ msgstr ""
"décision."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5967,12 +6030,43 @@ msgstr ""
"les réinstaller."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
+#, fuzzy
+#| msgid ""
+#| "Defaults to on which will cause APT to install essential and important "
+#| "packages as fast as possible in the install/upgrade operation. This is "
+#| "done to limit the effect of a failing &dpkg; call: If this option is "
+#| "disabled APT does treat an important package in the same way as an extra "
+#| "package: Between the unpacking of the important package A and his "
+#| "configuration can then be many other unpack or configuration calls, e.g. "
+#| "for package B which has no relation to A, but causes the dpkg call to "
+#| "fail (e.g. because maintainer script of package B generates an error) "
+#| "which results in a system state in which package A is unpacked but "
+#| "unconfigured - each package depending on A is now no longer guaranteed to "
+#| "work as their dependency on A is not longer satisfied. The immediate "
+#| "configuration marker is also applied to all dependencies which can "
+#| "generate a problem if the dependencies e.g. form a circle as a dependency "
+#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#| "it is possible that APT encounters a situation in which it is unable to "
+#| "perform immediate configuration, error out and refers to this option so "
+#| "the user can deactivate the immediate configuration temporary to be able "
+#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
+#| "here as this problem was only encountered by now in real world a few "
+#| "times in non-stable distribution versions and caused by wrong "
+#| "dependencies of the package in question or by a system in an already "
+#| "broken state, so you should not blindly disable this option as the "
+#| "mentioned scenario above is not the only problem immediate configuration "
+#| "can help to prevent in the first place. Before a big operation like "
+#| "<literal>dist-upgrade</literal> is run with this option disabled it "
+#| "should be tried to explicitly <literal>install</literal> the package APT "
+#| "is unable to configure immediately, but please make sure to report your "
+#| "problem also to your distribution and to the APT team with the buglink "
+#| "below so they can work on improving or correcting the upgrade process."
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5988,13 +6082,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -6003,14 +6097,44 @@ msgid ""
"distribution and to the APT team with the buglink below so they can work on "
"improving or correcting the upgrade process."
msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+"La valeur par défaut de ce réglage est « on » ce qui conduira APT à installer "
+"les paquets essentiels et importants dès que possible pendant les opérations "
+"d'installation ou de mise à jour. Cela permet de limiter les conséquences de "
+"l'échec d'un appel à &dpkg; : si cette option est désactivée, APT gérera un "
+"paquet important de la même manière qu'un paquet « extra » ; entre le "
+"dépaquetage du paquet important A et sa configuration pourront prendre place "
+"de nombreux autres opérations de dépaquetage ou de configuration. Ainsi, si "
+"le paquet B, qui n'a pas de rapport avec A, provoque une erreur de &dpkg; "
+"(p. ex. en cas d'erreur dans les scripts du responsable), le paquet A sera "
+"alors dans l'état installé mais non configuré et chaque paquet qui en dépend "
+"ne fonctionnera plus nécessairement puisque sa dépendance n'est pas "
+"satisfaite. Le marqueur de configuration immédiate sera aussi utilisé pour "
+"toute dépendance qui peut créer un problème, par exemple les dépendances "
+"circulaires. En effet, les marqueur de configuration immédiate revient à "
+"gérer une pré-dépendance. Il est donc possible, en théorie, qu'APT rencontre "
+"une situation où il lui est impossible d'effectuer la configuration "
+"immédiate, qu'il se termine alors avec une erreur en faisant référence à "
+"cette option afin que l'utilisateur puisse la désactiver temporairement pour "
+"retenter l'opération d'installation ou de mise à jour. Il est à noter que "
+"« en théorie » indique ici que cette situation n'a été rencontrée que dans de "
+"rares cas, sur des versions instables de distributions, la cause étant des "
+"dépendances incorrectes ou un système déjà dans un état instable. Il est "
+"donc déconseillé de désactiver cette option sans réfléchir car la situation "
+"décrite précédemmebnt n'est qu'un des cas où la configuration immédiate "
+"permet de résoudre des situations complexes. Avant de tenter une opération "
+"telle que <literal>dist-upgrade</literal> avec cette option désactivée, il "
+"est largement préférable d'essayer une opération <literal>install</literal> "
+"sur le paquet qu'APT ne peut configurer immédiatement. Il est également "
+"conseillé de signaler ce type de problème dans le système de suivi de bogues "
+"de la distribution utilisée afin qu'il soit étudié et corrigé."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6022,45 +6146,45 @@ msgstr ""
"Ne jamais activer cette option à moins que vous ne sachiez - réellement - ce "
"que vous faites. Elle autorise APT à supprimer temporairement un paquet "
"essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / "
-"Pre-Depends entre deux paquets essentiels. UNE TELLE BOUCLE NE DOIT JAMAIS "
-"SE PRODUIRE : C'EST UN BOGUE SÉRIEUX. Cette option fonctionne si les paquets "
-"essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont "
-"ces paquets dépendent."
+"Pre-Depends entre deux paquets essentiels. Une telle boucle ne devrait "
+"jamais se produire : c'est un bogue très important. Cette option fonctionne "
+"si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous "
+"les paquets dont ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
"APT utilise un fichier de cache chargé en mémoire avec mmap pour ranger les "
"informations sur les paquets disponibles. Cette option fixe la taille "
-"mémoire allouée pour le chargement de ce cache."
+"mémoire allouée (en octets) pour le chargement de ce cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6070,12 +6194,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6085,12 +6209,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6100,17 +6224,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6119,13 +6243,24 @@ msgstr ""
"literal> pour les paquets ou les fichiers sources, plutôt que de les "
"télécharger entièrement. Par défaut à « true »."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6134,19 +6269,19 @@ msgid ""
"connection per URI type will be opened."
msgstr ""
"Mode de file d'attente ; <literal>Queue-Mode</literal> peut prendre les "
-"valeurs <literal>host</literal> ou <literal>access</literal> et cela "
+"valeurs <literal>host</literal> ou <literal>access</literal>, ce qui "
"détermine comment APT parallélise les connexions sortantes. <literal>Host</"
"literal> signifie qu'une connexion par cible sera initiée, tandis que "
"<literal>access</literal> signifie qu'une connexion par type d'URI sera "
"initiée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6156,12 +6291,12 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6171,20 +6306,12 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
-#, fuzzy
-#| msgid ""
-#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>http::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
-#| "environment variable will override all settings."
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6194,16 +6321,17 @@ msgid ""
"<envar>http_proxy</envar> environment variable will be used."
msgstr ""
"URI HTTP ; http::Proxy est le mandataire (proxy) HTTP à utiliser par "
-"défaut. Il se présente sous la forme standard : <literal>http://[[user][:"
-"pass]@]host[:port]/</literal>. On peut spécifier un mandataire particulier "
-"par hôte distant en utilisant la syntaxe : <literal>http::Proxy::&lt;hôte&gt;"
-"</literal>. Le mot-clé spécial <literal>DIRECT</literal> indique alors de "
-"n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, la "
-"variable d'environnement <envar>http_proxy</envar> annule et remplace toutes "
-"les options de mandataire HTTP."
+"défaut. Il se présente sous la forme standard : <literal>http://"
+"[[utilisateur][:mot_de_passe]@]hôte[:port]/</literal>. On peut spécifier un "
+"mandataire particulier par hôte distant en utilisant la syntaxe : "
+"<literal>http::Proxy::&lt;hôte&gt;</literal>. Le mot-clé spécial "
+"<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour "
+"l'hôte. Si aucun des paramètres précédents n'est défini, la variable "
+"d'environnement <envar>http_proxy</envar> annule et remplace toutes les "
+"options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6222,32 +6350,24 @@ msgstr ""
"demande au cache de les mettre à jour quand leur ancienneté est supérieure "
"au nombre de secondes donné. Debian met à jour ses fichiers d'index de "
"manière quotidienne ; la valeur par défaut est donc de 1 jour. <literal>No-"
-"Store</literal> sert uniquement pour les fichiers d'archive  et demande au "
+"Store</literal> sert uniquement pour les fichiers d'archive et demande au "
"cache de ne jamais garder la requête. Cela peut éviter de polluer un cache "
"mandataire avec des fichiers .deb très grands. Note : Squid 2.0.2 ne prend "
"en compte aucune de ces options."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
"timeout."
msgstr ""
-"L'option <literal>timeout</literal> positionne le compteur de temps mort "
-"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données."
+"L'option <literal>timeout</literal> positionne le compteur d'expiration du "
+"délai (timeout) utilisé par la méthode. Cela vaut pour tout, connexion et "
+"données."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6262,12 +6382,12 @@ msgstr ""
"(comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </literal> a une "
"valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en attente "
"qui peuvent être émises. Quand la machine distante ne conserve pas "
-"correctement les connexions TCP, on DOIT donner une valeur égale à 0 -- "
-"sinon des données seront corrompues. Les machines qui ont besoin de cette "
-"option ne respectent pas la RFC 2068."
+"correctement les connexions TCP, la valeur doit égale à 0. Dans le cas "
+"contraire, des données seront corrompues. Les machines qui ont besoin de "
+"cette option ne respectent pas la RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6275,27 +6395,31 @@ msgid ""
"bandwidth (Note that this option implicit deactivates the download from "
"multiple servers at the same time.)"
msgstr ""
+"La bande passante utilisée peut être limité avec <literal>Acquire::http::Dl-"
+"Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
+"le kilo-octet. La valeur par défaut est 0, ce qui correspond à aucune "
+"limitation de bande passante. Veuillez noter que cette option désactive "
+"implicitement le téléchargement simultané depuis plusieurs serveurs."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
"clients only if the client uses a known identifier."
msgstr ""
+"L'option <literal>Acquire::http::User-Agent</literal> peut être utilisée "
+"pour envoyer une valeur User-Agent modifiée pour les téléchargements HTTP, "
+"ce qui peut par exemple être utile avec certains mandataires HTTP qui "
+"n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control and proxy options are the same as for "
-#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
-#| "is not supported yet."
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6303,12 +6427,15 @@ msgid ""
"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
-"URI HTTPS. Les options de contrôle de cache et de mandataire (proxy) sont "
-"les mêmes que pour la méthode <literal>http</literal>. L'option "
-"<literal>Pipeline-Depth</literal> n'est pas encore supportée."
+"URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation "
+"de redirection, de Dl-Limit et de mandataire (proxy) sont les mêmes que pour "
+"la méthode <literal>http</literal>. Les valeurs par défaut sont les mêmes "
+"que pour l'option <literal>http</literal> sauf si des valeurs spécifiques à "
+"https sont indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas "
+"encore gérée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6328,7 +6455,7 @@ msgid ""
"option."
msgstr ""
"La sous-option <literal>CaInfo</literal> spécifie le fichier contenant les "
-"informations sur les certificats de confiance. La sous-option booléenne "
+"informations sur les certificats de confiance. La sous-option booléenne "
"<literal>Verify-Peer</literal> précise si le certificat d'hôte du serveur "
"doit être confronté aux certificats de confiance ou pas. La sous-option "
"booléenne <literal>Verify-Host</literal> précise s'il faut vérifier ou pas "
@@ -6340,25 +6467,12 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
-#, fuzzy
-#| msgid ""
-#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
-#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
-#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
-#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
-#| "literal> script in the configuration file. This entry specifies the "
-#| "commands to send to tell the proxy server what to connect to. Please see "
-#| "&configureindex; for an example of how to do this. The substitution "
-#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
-#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
-#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6380,20 +6494,20 @@ msgstr ""
"port]/</literal>. On peut spécifier un mandataire particulier par hôte "
"distant en utilisant la syntaxe : <literal>ftp::Proxy::&lt;hôte&gt;</"
"literal>. Le mot-clé spécial <literal>DIRECT</literal> indique alors de "
-"n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, la "
-"variable d'environnement <envar>ftp_proxy</envar> annule et replace toutes "
-"les options de mandataire FTP. Pour utiliser un mandataire FTP, vous devrez "
-"renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le fichier de "
-"configuration. Cette entrée spécifie les commandes à envoyer au mandataire "
-"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour "
-"savoir comment faire. Les variables de substitution disponibles sont : "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> et <literal>$(SITE_PORT)</literal>. Chacune correspond à l'élément "
-"respectif de l'URI."
+"n'utiliser aucun mandataire pour l'hôte. Si aucun des paramètres précédents "
+"n'est définis, la variable d'environnement <envar>ftp_proxy</envar> annule "
+"et replace toutes les options de mandataire FTP. Pour utiliser un mandataire "
+"FTP, vous devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans "
+"le fichier de configuration. Cette entrée spécifie les commandes à envoyer "
+"au mandataire pour lui préciser à quoi il doit se connecter. Voyez "
+"&configureindex; pour savoir comment faire. Les variables de substitution "
+"disponibles sont : <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</"
+"literal>, <literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+"<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>. Chacune "
+"correspond à l'élément respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6410,7 +6524,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6421,11 +6535,11 @@ msgstr ""
"positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL "
"HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas "
"le faire dans le fichier de configuration et il n'est de toute façon pas "
-"recommandé d'utiliser FTP au travers de HTTP en raison la faible efficacité "
-"de cette méthode."
+"recommandé d'utiliser FTP au travers de HTTP en raison de la faible "
+"efficacité de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6441,19 +6555,18 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
-#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
+#: apt.conf.5.xml:374
+#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
-msgstr "\"/cdrom/\"::Mount \"foo\";"
+msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6467,20 +6580,20 @@ msgstr ""
"URI CD ; la seule option de configuration pour les URI de CD est le point de "
"montage : <literal>cdrom::Mount</literal> ; il doit représenter le point de "
"montage du lecteur de CD-ROM indiqué dans <filename>/etc/fstab</filename>. "
-"On peut fournir d'autres commandes de montage et de démontage quand le point "
-"de montage ne peut être listé dans le fichier <filename>/etc/fstab</"
+"D'autres commandes de montage et de démontage peuvent être fournies quand le "
+"point de montage ne peut être listé dans le fichier <filename>/etc/fstab</"
"filename> (par exemple, un montage SMB). Syntaxiquement, il faut placer "
"<placeholder type=\"literallayout\" id=\"0\"/> dans le bloc cdrom. La barre "
"oblique finale est importante. Les commandes de démontage peuvent être "
"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6491,18 +6604,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
-msgstr ""
+msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6512,21 +6625,29 @@ msgid ""
"the fly or the used method can be changed. The syntax for this is: "
"<placeholder type=\"synopsis\" id=\"0\"/>"
msgstr ""
+"Cette option indique la liste des types de compression comprises par les "
+"méthodes d'acquisition. Des fichiers comme <filename>Packages</filename> "
+"peuvent être disponibles dans divers formats de compression. Par défaut, les "
+"méthodes d'acquisition décompressent les fichiers compressés avec "
+"<command>bzip2</command>, <command>lzma</command> et <command>gzip</"
+"command>. Ce réglage permet d'ajouter à la volée des formats supplémentaires "
+"ou de modifier la méthode utilisée. La syntaxe à utiliser est : <placeholder "
+"type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6541,15 +6662,29 @@ msgid ""
"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
"<literal>bz2</literal> explicit to the list as it will be added automatic."
msgstr ""
+"Le sous-groupe <literal>Order</literal> peut être également utilisé pour "
+"définir l'ordre dans lequel le système d'acquisition tentera de télécharger "
+"les fichiers compressés. Le premier système mentionné sera essayé en "
+"premier, puis le suivant en cas d'échec. Ainsi, pour privilégier un format "
+"par rapport à un autre, il suffit de le placer en premier dans cette liste. "
+"Les types par défaut qui ne sont pas déjà indiqués seront ajoutés en fin de "
+"liste au moment de l'exécution. Ainsi, par exemple, <placeholder type="
+"\"synopsis\" id=\"0\"/> peut être utiliser de préférence les fichiers "
+"compressés avec <command>gzip</command> par rapport à <command>bzip2</"
+"command> et <command>lzma</command>. Si l'objectif est d'utiliser "
+"<command>lzma</command> en priorité par rapport à <command>gzip</command> et "
+"<command>bzip2</command>, ce réglage doit ressembler à <placeholder type="
+"\"synopsis\" id=\"1\"/>. Il est inutile d'ajouter explicitement "
+"<literal>bz2</literal> à liste car il sera ajouté automatiquement."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
-msgstr ""
+msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6562,9 +6697,20 @@ msgid ""
"will not override the defined list, it will only prefix the list with this "
"type."
msgstr ""
+"Veuillez noter qu'à l'exécution, <literal>Dir::Bin::<replaceable>Methodname</"
+"replaceable></literal> sera vérifié : si ce réglage existe, la méthode ne "
+"sera utilisée que si ce fichier existe. Ainsi, pour la méthode bzip2, le "
+"réglage (utilisé en interne) est <placeholder type=\"literallayout\" id=\"0"
+"\"/>. Veuillez également noter que les éléments de liste indiqués à la ligne "
+"de commande seront ajoutés à la fin de la liste indiquée dans les fichiers "
+"de configuration, mais avant les valeurs par défaut. Dans ce cas, pour "
+"établir une préférence par rapport aux types mentionnés dans les fichiers de "
+"configuration, il est possible de placer l'option directement, pas sous "
+"forme de liste. Cela ne remplacera pas la liste par défaut mais elle sera "
+"simplement préfixée avec l'option en question."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6572,38 +6718,84 @@ msgid ""
"time false negatives. Future versions will maybe include a way to really "
"prefer uncompressed files to support the usage of local mirrors."
msgstr ""
+"Bien qu'il soit possible d'ajouter un type vide de compression à la liste "
+"ordonnée, APT ne l'interprétera pas correctement et affichera de nombreux "
+"messages d'avertissement à propos d'échec de téléchargement, qui sont le "
+"plus souvent des avertissements sans conséquences. Dans de futures versions, "
+"il deviendra réellement possible d'établir une préférence pour des fichiers "
+"non compressés afin de gérer des miroirs locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
-msgstr ""
+msgstr "Langues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "Description-Translations. APT will try to display the first available "
+#| "Description for the Language which is listed at first. Languages can be "
+#| "defined with their short or long Languagecodes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
+"La sous-section « Languages » contrôle quels fichiers <filename>Translation</"
+"filename> sont téléchargés et dans quel ordre APT les utilisera pour "
+"afficher les traductions de descriptions. APT recherchera d'abord la "
+"première traduction disponible pour le champ Description dans la langue "
+"choisie en premier. Les langues peuvent être indiquées par leur code long ou "
+"court. Veuillez noter que tous les dépôts ne fournissent pas les fichiers "
+"<filename>Translation</filename> pour toutes les langues, particulièrement "
+"pour les code de langues long sont rares. Il est donc conseillé de vous "
+"renseigner sur ce qui est disponible avant d'établir des réglages "
+"impossibles."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
+msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used. To "
+#| "force apt to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a fitting "
+#| "<filename>Translation</filename> file. This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if not the environment specifies this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6612,16 +6804,35 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
"\"/>"
msgstr ""
+"La liste par défaut contient « environment » and « en ». La valeur "
+"« environment » a une signification spéciale : elle sera remplacée, à "
+"l'exécution, par les codes de langues utilisés dans la variable "
+"d'environnement <literal>LC_MESSAGES</literal>. Les codes utilisés en double "
+"ne seront pas inclus deux fois dans la liste. Si <literal>LC_MESSAGES</"
+"literal> contient « C », seul le fichier <filename>Translation-en</filename> "
+"sera utilisé, s'il est disponible. Pour forcer APT à n'utiliser aucun "
+"fichier de traduction, il est nécessaire d'utiliser le réglage "
+"<literal>Acquire::Languages=none</literal>. La valeur « <literal>none</"
+"literal> » a une signification spéciale et indique de ne rechercher aucun "
+"fichier <filename>Translation</filename>. Cela permet à l'administrateur "
+"local d'indiquer à APT de télécharger des fichiers sans les utiliser si la "
+"variable d'environnement ne les comporte pas. Ainsi, dans l'exemple qui "
+"suit, l'ordre utilisé sera « en, fr » si dans un environnement configuré pour "
+"l'anglais et « fr, en » pour un environnement configuré en français. Les "
+"fichiers pour l'allemand seront également téléchargés mais ne sont utilisés "
+"que dans un environnement configuré pour l'allemand. Dans ce dernier cas, "
+"l'ordre est alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0"
+"\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6631,12 +6842,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6656,7 +6867,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6669,17 +6880,17 @@ msgid ""
msgstr ""
"<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur "
"le cache local : par exemple, les deux caches de paquets "
-"<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, et aussi "
+"<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, ainsi que "
"l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::"
"archives</literal>. On peut empêcher la création des caches en saisissant un "
-"nom vide. Cela ralentit le démarrage mais sauve de l'espace disque. Il vaut "
-"mieux se passer du cache <literal>pkgcache</literal> plutôt que se passer du "
-"cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::State</"
-"literal>, le répertoire par défaut est contenu dans <literal>Dir::Cache</"
-"literal>."
+"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il "
+"vaut mieux se passer du cache <literal>pkgcache</literal> plutôt que se "
+"passer du cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::"
+"State</literal>, le répertoire par défaut est contenu dans <literal>Dir::"
+"Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6694,7 +6905,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -6705,15 +6916,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
-#, fuzzy
-#| msgid ""
-#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
-#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
-#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
-#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
-#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
-#| "location of the respective programs."
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6724,13 +6927,14 @@ msgid ""
msgstr ""
"Les programmes binaires sont pointés par <literal>Dir::Bin</literal>. "
"L'emplacement des gestionnaires de méthodes est indiqué par <literal>Dir::"
-"Bin::Methods</literal> ; <literal>gzip</literal>, <literal>dpkg</literal>, "
-"<literal>apt-get</literal>, <literal>dpkg-source</literal>, <literal>dpkg-"
-"buildpackage</literal> et <literal>apt-cache</literal> indiquent "
-"l'emplacement des programmes correspondants."
+"Bin::Methods</literal> ; <literal>gzip</literal>, <literal>bzip2</literal>, "
+"<literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-get</"
+"literal>, <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</"
+"literal> et <literal>apt-cache</literal> indiquent l'emplacement des "
+"programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6752,12 +6956,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6768,12 +6972,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6791,7 +6995,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6800,12 +7004,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6814,12 +7018,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6829,12 +7033,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6843,7 +7047,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
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 "
@@ -6854,17 +7058,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -6877,12 +7081,12 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -6898,7 +7102,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6914,12 +7118,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6928,12 +7132,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6943,12 +7147,14 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
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:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6961,9 +7167,21 @@ msgid ""
"all frontends will currently stay around half (or more) of the time in the "
"100% state while it actually configures all packages."
msgstr ""
+"APT peut lancer dpkg pour utiliser les actions différées de manière "
+"agressive entre les appels successifs à dpkg. Sans options supplémentaires, "
+"dpkg n'utilisera les actions différées que dans le cadre de sa propre "
+"exécution. Si ces options sont utilisées, le temps d'exécution peut diminuer "
+"fortement dans les actions d'installation ou de mise à jour. Il est prévu de "
+"les activer par défaut dans le futur mais étant donné qu'elles changent "
+"notablement la méthode qu'utilise APT pour lancer dpkg, elles ont besoin "
+"d'importantes validations. <emphasis>Ces options sont donc expérimentales et "
+"ne devraient pas être utilisées avec des environnements de production.</"
+"emphasis>. Elles modifient également le suivi de progression et toutes les "
+"interfaces passeront la moitié du temps à un état terminé à 100% pendant la "
+"configuration des paquets."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6971,9 +7189,13 @@ msgid ""
"DPkg::ConfigurePending \"true\";\n"
"DPkg::TriggersPending \"true\";"
msgstr ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -6985,14 +7207,24 @@ msgid ""
"see e.g. <command>dpkg --audit</command>. A defensive option combination "
"would be <placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
+"Veuillez noter que rien ne garantit qu'APT gérera encore ces options dans le "
+"futur ou qu'elles ne provoqueront pas de nombreux dégâts. Si vous avez bien "
+"compris les implications de ce choix et êtes suffisamment motivé(e) pour "
+"essayer ces options, il vous est donc possible de créer un nouveau fichier "
+"de configuration et essayer une combinaison de ces options. Veuillez "
+"signaler tout bogue, problèmes ou suggestions d'amélioration en prenant soin "
+"de mentionner les options utilisées. Utiliser l'aide apportée par dpkg peut "
+"également être utile pour le débogage, par exemple <command>dpkg --audit</"
+"command>. Une combinaison intéressante d'options pourrait être <placeholder "
+"type=\"literallayout\" id=\"0\"/>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
-msgstr ""
+msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -7002,16 +7234,24 @@ msgid ""
"Previously these option only append --no-triggers to the configure calls to "
"dpkg - now apt will add these flag also to the unpack and remove calls."
msgstr ""
+"Ajoute l'option « no-triggers » à tous les appels à dpkg (hormis l'appel "
+"« ConfigurePending »). Voir &dpkg; pour plus d'informations sur la "
+"signification de cette option. En résumé, dpkg n'effectuera pas les actions "
+"différées (« triggers ») si cette option est utilisée sauf si cela est "
+"demandé explicitement dans une invocation supplémentaire. Cette option "
+"existe en fait déjà (mais n'est pas documentée) dans de plus anciennes "
+"version d'APT avec une signification légèrement différente : elle n'ajoutait "
+"l'option « --no-triggers » qu'aux appels de dpkg avec « configure » alors que "
+"cela sera désormais utilisé également avec les appels à dpkg avec les "
+"options « unpack » et « remove »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
-#, fuzzy
-#| msgid "Packages::Compress"
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
-msgstr "Packages::Compress"
+msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7025,14 +7265,26 @@ msgid ""
"value will implicitly activate also the next option per default as otherwise "
"the system could end in an unconfigured status which could be unbootable!"
msgstr ""
+"Les valeurs possibles sont « <literal>all</literal> », « <literal>smart</"
+"literal> » et « <literal>no</literal> ». La valeur par défaut est "
+"« <literal>all</literal> » où APT configure explicitement tous les paquets. "
+"La valeur « <literal>smart</literal> » permet de ne configurer que les "
+"paquets qui ont besoin de l'être avant la décompaction d'un autre paquet (à "
+"cause d'une pré-dépendance) ; les autres configurations sont laissées pour "
+"un appel ultérieur à dpkg. L'option « <literal>no</literal> » ne provoquera "
+"aucune configuration et s'en remettra totalement à dpkg pour ces opérations "
+"(ce qui échouera en cas de pré-dépendances). Si cette option est définie sur "
+"une valeur différente de « <literal>all</literal> », l'option suivante sera "
+"activée par défaut pour éviter de placer le système dans un état non "
+"configuré et donc éventuellement non amorçable."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
-msgstr ""
+msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7041,14 +7293,22 @@ msgid ""
"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 ""
+"Si cette option est choisie, APT lancera <command>dpkg --configure --"
+"pending</command> pour laisser dpkg gérer les configurations de paquets et "
+"les actions différées. Cette option est automatiquement activée si l'option "
+"précédente a une valeur différente de « <literal>all</literal> ». Il peut par "
+"contre être utile de la désactiver pour lancer APT plusieurs fois "
+"successives, par exemple quand il est utilisé depuis un outil "
+"d'installation. Dans ce cas, seul le dernier de tous les appels successifs "
+"peut conserver l'option active."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
-msgstr ""
+msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7056,14 +7316,22 @@ msgid ""
"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
"triggers, not only the triggers needed to configure this package."
msgstr ""
+"Cette option est utile pour la configuration en mode « <literal>smart</"
+"literal> ». En effet, un paquet qui a des actions différées (« triggers ») en "
+"attente n'est pas considéré comme installé (état « <literal>installed</"
+"literal> ») et dpkg le considère actuellement comme simplement décompacté "
+"(état « <literal>unpacked</literal> ») ce qui empêche une gestion correcte "
+"des pré-dépendances (voir le bogue Debian #526774). Veuillez noter que cette "
+"option provoquera la gestion de toutes les actions différées, pas seulement "
+"celles concernant le paquet en cours de traitement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
-msgstr ""
+msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7073,14 +7341,27 @@ msgid ""
"method is very experimental and needs further improvements before becoming "
"really useful."
msgstr ""
+"Cette option permet de ne trier les opérations de décompactage qu'en "
+"fonction de leur criticité (c'est à dire en ne considérant que les pré-"
+"dépendances) dans le cas où la configuration des paquets est différée pour "
+"n'être effectuée qu'à la fin par dpkg. Cette option est active par défaut, "
+"ce qui revient à la méthode traditionnelle où les opérations ont lieu en "
+"plusieurs étapes, selon l'ensemble des critères de tri. Bien que les deux "
+"méthodes existent même dans les versions, la méthode "
+"« <literal>OrderCritical</literal> » n'était pas utilisée. Elle doit donc "
+"être considérée comme très expérimentale et a besoin de nombreuses "
+"améliorations avant de devenir réellement utile. (Note du traducteur : la "
+"version originale de cette partie des pages de manuel est très confuse. Il "
+"est donc conseillé de s'y reporter en cas de doute car le contresens de "
+"traduction n'est pas exclu...)."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
-msgstr ""
+msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7090,9 +7371,15 @@ msgid ""
"\tPreDepends 50;\n"
"};"
msgstr ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7104,14 +7391,26 @@ msgid ""
"change the scoring. The following example shows the settings with there "
"default values. <placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
+"Les paquets essentiels (et leurs dépendances) devraient être configurés "
+"après avoir été décompressés. Il est conseillé que cette opération ait lieu "
+"le plus tôt possible dans le processus de mise à jour car ces opérations de "
+"configuration nécessitent également <literal>DPkg::TriggersPending</"
+"literal>, ce qui peut conduire à l'exécution de certains actions différées "
+"qui ne sont pas nécessairement utiles. Les paquets essentiels obtiennent par "
+"défaut un score élevé mais le marqueur « immédiat » implique un score assez "
+"bas (par exemple un paquet qui comporte des prédépendances obtient un score "
+"plus élevé). Cette option et les options du même groupe permettent de "
+"modifier la façon d'attribuer un score. L'exemple ci-dessous indique ces "
+"réglages avec leurs valeurs par défaut. <placeholder type=\"literallayout\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7123,12 +7422,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7146,7 +7445,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7157,7 +7456,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7169,7 +7468,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7179,9 +7478,9 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7190,62 +7489,59 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
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><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
-msgid ""
-"Print information related to accessing <literal>cdrom://</literal> sources."
+#: apt.conf.5.xml:711
+msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"Affiche les informations concernant les sources de type <literal>cdrom://</"
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Affiche les informations concernant le téléchargement de paquets par FTP."
+msgstr "Affiche les informations concernant le téléchargement de paquets par FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
-msgstr ""
-"Affiche les informations concernant le téléchargement de paquets par HTTP."
+msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
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><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7254,12 +7550,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7268,24 +7564,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
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><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7294,12 +7590,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -7310,12 +7606,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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."
@@ -7325,24 +7621,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
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><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7352,12 +7648,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7367,12 +7663,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7382,25 +7678,24 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
-msgid ""
-"Log all interactions with the sub-processes that actually perform downloads."
+#: apt.conf.5.xml:862
+msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"Affiche toutes les interactions avec les processus enfants qui se chargent "
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7409,12 +7704,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7429,12 +7724,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7469,24 +7764,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7495,12 +7790,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7510,12 +7805,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7524,33 +7819,32 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
-msgid ""
-"Output status messages tracing the steps performed when invoking &dpkg;."
+#: apt.conf.5.xml:963
+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><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
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><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7559,12 +7853,12 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -7575,12 +7869,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7589,7 +7883,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7598,19 +7892,17 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
-#, fuzzy
-#| msgid "&apt-conf;"
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
-msgstr "&apt-conf;"
+msgstr "&file-aptconf;"
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
@@ -7628,19 +7920,16 @@ msgstr "Fichier de contrôle des préférences pour APT"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-#| "used to control which versions of packages will be selected for "
-#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
"can be used to control which versions of packages will be selected for "
"installation."
msgstr ""
-"Le fichier d'APT, <filename>/etc/apt/preferences</filename>, peut être "
-"utilisé pour choisir la version des paquets que l'on veut installer."
+"Le fichier d'APT, <filename>/etc/apt/preferences</filename> et les fichiers "
+"fragments situés dans le dossier <filename>/etc/apt/preferences.d/</"
+"filename>, peuvent être utilisé pour choisir la version des paquets que l'on "
+"veut installer."
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:39
@@ -7679,25 +7968,36 @@ msgstr ""
"&sources-list;. Le fichier des préférences n'influe pas sur le choix des "
"exemplaires, seulement sur le choix de la version."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr "Priorités affectées par défaut"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -7722,22 +8022,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr "une priorité égale à 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr "est affectée à la version déjà installée (si elle existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr "une priorité égale à 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7746,20 +8046,19 @@ msgstr ""
"pas à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#: apt_preferences.5.xml:101
+msgid "to the versions that are not installed and belong to the target release."
msgstr ""
"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -7770,7 +8069,7 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -7781,7 +8080,7 @@ msgstr ""
"une priorité égale à 500 à tout version non installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7790,7 +8089,7 @@ msgstr ""
"qu'il faut installer (par ordre de priorité) :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7806,12 +8105,12 @@ msgstr ""
"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr "Installer la version qui possède la priorité la plus haute."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7820,7 +8119,7 @@ msgstr ""
"plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7832,7 +8131,7 @@ msgstr ""
"qui n'est pas installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -7847,7 +8146,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get dist-upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -7860,7 +8159,7 @@ msgstr ""
"<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -7879,12 +8178,12 @@ msgstr ""
"priorité que celle de la version installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr "Conséquences des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -7897,7 +8196,7 @@ msgstr ""
"formes, une forme particulière et une forme générale."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -7912,7 +8211,7 @@ msgstr ""
"dont le numéro de version commence par <literal>5.8</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7924,7 +8223,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -7939,7 +8238,7 @@ msgstr ""
"un nom complètement qualifié."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -7950,7 +8249,7 @@ msgstr ""
"priorité haute à toutes les versions disponibles dans le site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -7962,7 +8261,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -7977,7 +8276,7 @@ msgstr ""
"mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -7988,7 +8287,7 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -8000,7 +8299,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8011,7 +8310,7 @@ msgstr ""
"<literal>squeeze</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -8023,7 +8322,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8035,7 +8334,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -8047,17 +8346,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8066,12 +8365,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8081,12 +8380,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8095,12 +8394,12 @@ msgstr ""
"distribution par défaut ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8109,29 +8408,29 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr "la version sera installée si aucune version du paquet n'est installée."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8142,7 +8441,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8156,7 +8455,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8165,7 +8464,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8193,12 +8492,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8212,7 +8511,7 @@ msgstr ""
"installée est une version 5.9*, il y aura un retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8223,7 +8522,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8236,13 +8535,12 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
-msgstr ""
-"Détermination de la version des paquets et des propriétés des distributions"
+msgstr "Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8253,27 +8551,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8294,12 +8592,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8316,18 +8614,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -8343,13 +8641,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8365,7 +8663,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8377,12 +8675,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8400,18 +8698,18 @@ msgstr ""
"fichier des préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8424,18 +8722,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8448,13 +8746,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8476,7 +8774,7 @@ msgstr ""
"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8501,12 +8799,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8517,7 +8815,7 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -8530,12 +8828,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8559,7 +8857,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8574,8 +8872,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8587,7 +8885,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8600,13 +8898,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8619,12 +8917,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -8652,7 +8950,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8669,7 +8967,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -8682,13 +8980,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8707,12 +9005,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8746,7 +9044,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8770,7 +9068,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -8783,13 +9081,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8808,14 +9106,12 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
-#, fuzzy
-#| msgid "apt_preferences"
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
-msgstr "apt_preferences"
+msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8831,12 +9127,6 @@ msgstr "Liste des sources de paquets"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -8850,16 +9140,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -8870,15 +9150,15 @@ msgid ""
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
msgstr ""
-"La liste des sources est conçue pour prendre en compte un nombre quelconque "
-"de sources actives et différents média. Le fichier présente une source par "
-"ligne et la source préférée apparaît en premier. Le format de chaque ligne "
-"est : <literal>type uri args</literal>. Le premier élément, <literal>type</"
-"literal>, détermine le format des <literal>args</literal>. <literal>uri</"
-"literal> est un identificateur universel de ressources (URI), qui est un sur-"
-"ensemble du plus spécifique et bien connu repère universel de ressources, ou "
-"URL. La fin de la ligne peut être un commentaire commençant par un caractère "
-"#."
+"La liste des sources est conçue pour gérer un nombre quelconque de sources "
+"actives et différents média. Le fichier présente une source par ligne et la "
+"source préférée apparaît en premier. Le format de chaque ligne est : "
+"<literal>type uri paramètres</literal>. Le premier élément, <literal>type</"
+"literal>, détermine le format des <literal>paramètres</literal>. "
+"<literal>uri</literal> est un identificateur universel de ressources (URI), "
+"qui est un sur-ensemble du plus spécifique et bien connu repère universel de "
+"ressources, ou URL. La fin de la ligne peut être un commentaire commençant "
+"par un caractère #."
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml:50
@@ -8910,17 +9190,6 @@ msgstr "Les types deb et deb-src."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -8938,23 +9207,19 @@ msgstr ""
"literal>, <literal>unstable</literal>, ou <literal>testing</literal>, et "
"composant : <literal>main</literal>, <literal>contrib</literal>, "
"<literal>non-free</literal>, ou <literal>non-us</literal>. Le type "
-"<literal>deb-src</literal> décrit le code source pour une distribution "
-"Debian dans le même format que le type <literal>deb</literal>. Une ligne "
-"<literal>deb-src</literal> est nécessaire pour récupérer les index des "
-"sources."
+"<literal>deb-src</literal> décrit une archive de distribution de code source "
+"pour une distribution Debian dans le même format que le type <literal>deb</"
+"literal>. Une ligne <literal>deb-src</literal> est nécessaire pour récupérer "
+"les index des sources."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
"Le format d'une entrée dans <filename>sources.list</filename> utilisant les "
-"types <literal>deb</literal> et <literal>deb-src</literal> est de la forme :"
+"types <literal>deb</literal> et <literal>deb-src</literal> est :"
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:76
@@ -8964,16 +9229,6 @@ msgstr "deb uri distribution [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -9100,14 +9355,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9187,21 +9434,42 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
+#, fuzzy
+#| msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
+msgstr "type d'URI les plus simples à reconnaître"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <literal>apt-transport-"
+#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similiar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see "
+#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
+#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgstr ""
+"APT peut être complété avec des méthodes supplémentaires fournies par des "
+"paquets optionnels dont le schéma de nommage est <literal>apt-transport-"
+"<replaceable>méthode</replaceable></literal>. Ainsi, l'équipe de "
+"maintenance d'APT gère un paquet <literal>apt-transport-https</literal> qui "
+"gère les accès par URI de type https, avec des fonctionnalités analogues à "
+"la méthode http. D'autres méthodes telles que debtorrent sont aussi "
+"disponibles (voir <citerefentry> <refentrytitle><filename>apt-transport-"
+"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
+"citerefentry>)."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
@@ -9283,12 +9551,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9354,28 +9616,29 @@ msgstr "&apt-cache; &apt-conf;"
#. type: <title></title>
#: guide.sgml:4
msgid "APT User's Guide"
-msgstr ""
+msgstr "Guide d'utilisation d'APT"
#. type: <author></author>
#: guide.sgml:6 offline.sgml:6
msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
+msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
#. type: <version></version>
#: guide.sgml:7
msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
+msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
#. type: <abstract></abstract>
#: guide.sgml:11
-msgid ""
-"This document provides an overview of how to use the the APT package manager."
+msgid "This document provides an overview of how to use the the APT package manager."
msgstr ""
+"Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
+"paquets APT."
#. type: <copyrightsummary></copyrightsummary>
#: guide.sgml:15
msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1998."
#. type: <p></p>
#: guide.sgml:21 offline.sgml:22
@@ -9385,6 +9648,10 @@ msgid ""
"published by the Free Software Foundation; either version 2 of the License, "
"or (at your option) any later version."
msgstr ""
+"APT, ainsi que ce document, sont libres. Vous pouvez les redistribuer et les "
+"modifier en respectant les conditions de la licence publique générale GNU "
+"telle que publiée par la Free Software Foundation, en version 2 ou "
+"ultérieure."
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
@@ -9392,13 +9659,13 @@ msgid ""
"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
+"Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
+"Linux, consultables dans le fichier usr/share/common-licenses/GPL."
#. type: <heading></heading>
#: guide.sgml:32
-#, fuzzy
-#| msgid "generate"
msgid "General"
-msgstr "generate"
+msgstr "Généralités"
#. type: <p></p>
#: guide.sgml:38
@@ -9408,11 +9675,15 @@ msgid ""
"provide a way to install and remove packages as well as download new "
"packages from the Internet."
msgstr ""
+"Le paquet APT comporte actuellement deux parties : la méthode APT pour "
+"<prgn>dselect</prgn> et l'interface en ligne de commande <prgn>apt-get</"
+"prgn>. Les deux fournissent des méthodes d'installation et de suppression de "
+"paquets ainsi que de téléchargement de nouveaux paquets par Internet."
#. type: <heading></heading>
#: guide.sgml:39
msgid "Anatomy of the Package System"
-msgstr ""
+msgstr "Anatomie du système de gestion des paquets"
#. type: <p></p>
#: guide.sgml:44
@@ -9421,6 +9692,10 @@ msgid ""
"with each package to help assure that it integrates cleanly and easily into "
"the system. The most prominent of its features is the dependency system."
msgstr ""
+"Le système de gestion de paquets de Debian intègre de nombreuses "
+"informations associées à chaque paquet afin de garantir qu'il s'intègre "
+"proprement et facilement sur le système. Une des fonctionnalités les plus "
+"immédiatement visibles est le système de gestion des dépendances."
#. type: <p></p>
#: guide.sgml:52
@@ -9431,6 +9706,13 @@ msgid ""
"things the average user is required to install. Also, it allows for choices "
"in mail transport agents, X servers and so on."
msgstr ""
+"Le système de gestion des dépendances permet aux programmes de partage des "
+"éléments du système, tels que les bibliothèques de fonctions. Il permet "
+"d'isoler dans des paquets spécifiques certains parties moins utilisées des "
+"programmes afin de limiter le nombre d'éléments que l'utilisateur ordinaire "
+"a besoin d'installer. Ce système de gestion des dépendances permet également "
+"d'effectuer des choix parmi les divers agents de transport de courrier "
+"électronique, les serveurs X et d'autres cxomposants du système."
#. type: <p></p>
#: guide.sgml:57
@@ -9440,15 +9722,31 @@ msgid ""
"package requires another package to be installed at the same time to work "
"properly."
msgstr ""
+"La première étape de compréhension de la gestion de dépendances est "
+"d'examiner le fonctionnement d'une dépendance simple. Une dépendance simple "
+"est le cas où un paquet donné a besoin qu'un autre paquet soit installé "
+"simultanément pour pouvoir fonctionner correctement."
#. type: <p></p>
#: guide.sgml:63
+#, fuzzy
+#| msgid ""
+#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
+#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
+#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
+#| "extension it has a simple dependency on emacs, without emacs it is "
+#| "completely useless."
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
+"Par example, mailcrypt est une extension à Emacs qui permet de gérer le "
+"courrier électronique chiffré avec GPG. Si GPG n'est pas installé, mailcrypt "
+"est inutile. Donc le paquet mailcrypt a une dépendance simple sur GPG. De "
+"plus, étant une extension à Emacs sans lequel il est totalement inutile, il "
+"a une dépendance simple sur emacs."
#. type: <p></p>
#: guide.sgml:73
@@ -9462,6 +9760,17 @@ msgid ""
"system so all mail transport agents have a conflicting dependency with all "
"other mail transport agents."
msgstr ""
+"Un autre type de dépendance importante est la dépendance en conflit. Cela "
+"signifie qu'un paquet ne fonctionne pas lorsqu'il est installé en même temps "
+"qu'un autre paquet donné, ce qui peut même être dommageable pour le système. "
+"Un exemple est par exemple constitué par les agents de transport de courrier "
+"tels que sendmail, exim ou qmail. Il n'est pas possible d'installer deux "
+"agents de transport de courrier simultanément puisque les deux ont besoin "
+"d'être à l'écoute sur le réseau pour recevoir le courrier électronique. "
+"Installer deux programmes de ce type sur le même système pourrait conduire à "
+"des pertes de données, ce qui explique que tous les agents de transport de "
+"courrier électronique soient établis comme étant en conflit les uns avec les "
+"autres."
#. type: <p></p>
#: guide.sgml:83
@@ -9475,6 +9784,16 @@ msgid ""
"depend on mail-transport-agent. This can add a great deal of confusion when "
"trying to manually fix packages."
msgstr ""
+"Il existe également la possibilité pour un paquet donné de prétendre être un "
+"autre paquet. Par exemple, exim et sendmail sont analogues sur de nombreux "
+"aspects ; ils servent tous deux à acheminer le courrier électronique et leur "
+"interface d'utilisation est la même. Pour cette raison, le système de "
+"gestion des paquets leur fournit la possibilité d'indiquer qu'ils sont "
+"chacun un agent de transport de courrier (« mail transport agent ») en "
+"indiquant qu'ils fournissent (« Provides ») « mail-transport-agent ». Ainsi, "
+"un paquet qui a besoin de cette fonctionnalité peut dépendre simplement d'un "
+"paquet « mail-transprot-agent ». Cette fonctionnalité utile peut toutefois "
+"rendre la correction de certains défauts des paquets plus complexe."
#. type: <p></p>
#: guide.sgml:88
@@ -9484,6 +9803,10 @@ msgid ""
"issues by providing a number of automatic algorithms that help in selecting "
"packages for installation."
msgstr ""
+"À un instant donné, une dépendance donnée peut être ou pas remplie par des "
+"paquets installés ou pas encore installés. APT tente donc de résoudre les "
+"problèmes de dépendances par l'intermédiaire d'un certain nombre "
+"d'algorithmes automatiques qui simplifient le choix des paquets à installer."
#. type: <p></p>
#: guide.sgml:102
@@ -9493,6 +9816,11 @@ msgid ""
"understand .deb files, it works with the package's proper name and can only "
"install .deb archives from a <em>Source</em>."
msgstr ""
+"Le programme <prgn>apt-get</prgn> offre une méthode simple pour installer "
+"des paquets à la ligne de commande. À la différence de <prgn>dpkg</prgn>, "
+"<prgn>apt-get</prgn> ne gère pas directement les fichiers .deb files. Il "
+"travaille avec le nom des paquets et ne peut installer les archives .deb que "
+"depuis une <em>Source</em>."
#. type: <p></p>
#: guide.sgml:109
@@ -9504,6 +9832,13 @@ msgid ""
"packages are available. This is done with <tt>apt-get update</tt>. For "
"instance,"
msgstr ""
+"La première action <footnote><p>Si vous utilisez un serveur mandataire "
+"(« proxy ») HTTP, vous devez d'abord positionner la variable d'environnement "
+"http_proxy, voir sources.list(5)</p></footnote> à effectuer avant d'utiliser "
+"<prgn>apt-get</prgn> est de récupérer les listes de paquets depuis les "
+"<em>Sources</em> afin que le programme sache quels sont les paquets "
+"disponibles. Cela peut être effectué avec la commande <tt>apt-get update</"
+"tt>. Par exemple,"
#. type: <example></example>
#: guide.sgml:116
@@ -9515,11 +9850,18 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get update\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Lecture des listes de paquets... Fait\n"
+"Construction de l'arbre des dépendances... Fait"
#. type: <p><taglist>
#: guide.sgml:120
msgid "Once updated there are several commands that can be used:"
msgstr ""
+"Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
+"utilisées :"
#. type: <p></p>
#: guide.sgml:131
@@ -9532,6 +9874,17 @@ msgid ""
"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
"<tt>apt-get install</tt> can be used to force these packages to install."
msgstr ""
+"La commande « upgrade » permet de mettre à jour le système de manière non "
+"invasive. Cette commande ne provoquera jamais l'installation de nouveaux "
+"paquets ou la suppression de paquets existants. Elle ne déclenchera pas non "
+"plus la mise à jour d'un paquet si celle-ci casse le fonctionnement d'un "
+"autre paquet. Cette commande peut être utilisé par exemple quotidiennement "
+"pour mettre à jour le système de manière relativement sûre. Lorsqu'elle est "
+"utilisée, la liste des paquets qui ne peuvent être mis à jour sera affichée. "
+"Cela est en général du au fait qu'ils dépendent de nouveaux paquets ou "
+"qu'ils entrent en conflit avec d'autres paquets. Le programme <prgn>dselect</"
+"prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
+"forcer l'installation de tels paquets."
#. type: <p></p>
#: guide.sgml:140
@@ -9544,6 +9897,15 @@ msgid ""
"listed packages and will print a summary and ask for confirmation if "
"anything other than its arguments are changed."
msgstr ""
+"La commande « install » permet d'installer des paquets par nom. Le paquet à "
+"installer est automatiquement récupéré et installé. Cela est utile lorsque "
+"le nom du paquet à installer est déjà connu et que l'on ne souhaite pas "
+"passer par une interface graphique pour le choisir. Un nombre quelconque de "
+"paquets peuvent être demandés à être installés ;  ils seront alors tous "
+"récupérés. La commande « install » résout automatiquement les problèmes de "
+"dépendances pour les paquets concernés, puis affiche un résumé avant de "
+"demander une confirmation si des actions autres que ce qui est demandé à la "
+"ligne de commande sont nécessaires."
#. type: <p></p>
#: guide.sgml:149
@@ -9556,6 +9918,15 @@ msgid ""
"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
"prgn> can be used to install any packages that may have been left out."
msgstr ""
+"La commande « dist-upgrade » est une commande de mise à jour complète d'abord "
+"destinés à permettre les mises à jour entre deux versions successives de la "
+"distribution. Via un algorithme complexe, le meilleur jeu de paquets à "
+"installer, mettre à jour ou supprimer est déterminé dans le but d'amener une "
+"majorité du système vers la nouvelle version. Dans certains cas, il peut "
+"être judicieux d'utiliser « dist-upgrade » plutôt que de chercher à résoudre "
+"manuellement les dépendances avec <prgn>dselect</prgn>. Une fois que « dist-"
+"upgrade » a été utilisé, <prgn>dselect</prgn> peut servir à installer les "
+"paquets qui auraient pu être laissés de côté."
#. type: <p></p>
#: guide.sgml:152
@@ -9563,6 +9934,8 @@ msgid ""
"It is important to closely look at what dist-upgrade is going to do, its "
"decisions may sometimes be quite surprising."
msgstr ""
+"Il est important de regarder de près ce que « dist-upgrade » car ses "
+"décisions peuvent parfois apparaître surprenantes."
#. type: <p></p>
#: guide.sgml:163
@@ -9575,13 +9948,20 @@ msgid ""
"the downloaded archives can be installed by simply running the command that "
"caused them to be downloaded again without <tt>-d</tt>."
msgstr ""
+"<prgn>apt-get</prgn> fournit de nombreuses options de ligne de commande qui "
+"sont expliquées en détail dans sa page de manuel, <manref section=\"8\" name="
+"\"apt-get\">. Une des plus utiles est l'option <tt>-d</tt> qui récupère sans "
+"les installer les fichiers nécessaires. Si le système a besoin de "
+"télécharger un grand nombre de paquets, il est par exemple souhaitable de "
+"pouvoir simplement les récupérer sans les installer immédiatement, au cas où "
+"quelque chose se passe mal. Une fois que <tt>-d</tt> a été utilisé, il est "
+"possible d'installer les archives téléchargées en exécutant simplement la "
+"commande qui a permis de les récupérer, sans l'option <tt>-d</tt>."
#. type: <heading></heading>
#: guide.sgml:168
-#, fuzzy
-#| msgid "APT in DSelect"
msgid "DSelect"
-msgstr "APT et DSelect"
+msgstr "DSelect"
#. type: <p></p>
#: guide.sgml:173
@@ -9591,12 +9971,28 @@ msgid ""
"to select the packages to be installed or removed and APT actually installs "
"them."
msgstr ""
+"La méthode APT de <prgn>dselect</prgn> permet d'utiliser le système APT dans "
+"son ensemble depuis l'interface graphique de gestion des paquets "
+"<prgn>dselect</prgn>. L'interface est alors utilisée pour choisir les "
+"paquets à installer ou supprimer et c'est APT qui effectue les opérations "
+"individuelles d'installation ou suppression."
#. type: <p></p>
#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+#, fuzzy
+#| msgid ""
+#| "To enable the APT method you need to 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."
+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 "
@@ -9605,6 +10001,17 @@ msgid ""
"have access to the latest bug fixes. APT will automatically use packages on "
"your CDROM before downloading from the Internet."
msgstr ""
+"Pou ractiver la méthode APT, il est nécessaire de choisir [A]ccéder dans "
+"<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
+"<em>Sources</em> d'installation seront demandées, qui sont les emplacements "
+"d'où les paquets seront récupérés. Cela peut être des sites Internet "
+"distants, des miroirs locaux ou des CD. Chaque source peut fournir un sous-"
+"ensemble de l'archive complète Debian. APT les combinera automatiquement "
+"pour créer un jeu complet de paquets. Avec des supports de type CD, il est "
+"conseillé de les indiquer en premier puis de les compléter avec un miroir "
+"distant qui permettra d'obtenir les versions les plus à jour s'il y en a. "
+"APT utilisera alors les paquets disponibles sur les CD avant de les "
+"télécharger via l'Internet."
#. type: <example></example>
#: guide.sgml:198
@@ -9623,6 +10030,18 @@ msgid ""
" \n"
" URL [http://llug.sep.bnl.gov/debian]:"
msgstr ""
+" Réglage de a liste des emplacements sources de distribution\n"
+"\t \n"
+" Veuillez indiquer l'URL de base de la distribution Debian.\n"
+" Les schémas d'accès connus sont : http file\n"
+"\t \n"
+" Exemple:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
#. type: <p></p>
#: guide.sgml:205
@@ -9631,6 +10050,9 @@ msgid ""
"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
"get."
msgstr ""
+"La configuration des <em>Sources</em> débute par l'indication de la base de "
+"l'archive Debian, par défaut un miroir HTTP. Puis la distribution est "
+"demandée."
#. type: <example></example>
#: guide.sgml:212
@@ -9642,6 +10064,12 @@ msgid ""
" \n"
" Distribution [stable]:"
msgstr ""
+" Veuillez indiquer le nom de la distribution à utiliser ou\n"
+" le chemin d'accès au fichier des paquets, terminé par un /.\n"
+" Les noms de distribution sont en général de la forme suivante :\n"
+" stable unstable testing non-US\n"
+" \n"
+" Distribution [stable] :"
#. type: <p></p>
#: guide.sgml:222
@@ -9653,6 +10081,14 @@ msgid ""
"that cannot be exported from the United States. Importing these packages "
"into the US is legal however."
msgstr ""
+"La distribution fait référence à la version de Debian dans l'archive. "
+"<em>stable</em> est la dernière version publiée et <em>unstable</em> la "
+"version en développement. <em>non-US</em> n'est disponible que sur certains "
+"miroirs et fait référence à des paquets contenant des technologies de "
+"chiffrement et d'autres élements dont l'exportation est interdite depuis les "
+"États-Unis d'Amérique. Il est toutefois autorisé de les y importer. [Note du "
+"traducteur : à la date de cette traduction, 2010, cette notion est "
+"totalement obsolète]."
#. type: <example></example>
#: guide.sgml:228
@@ -9663,6 +10099,11 @@ msgid ""
" \n"
" Components [main contrib non-free]:"
msgstr ""
+" Veuillez indiquer les composants à utiliser\n"
+" Les composants sont en général de la forme suivante :\n"
+" main contrib non-free\n"
+" \n"
+" Composants [main contrib non-free] :"
#. type: <p></p>
#: guide.sgml:236
@@ -9672,6 +10113,12 @@ msgid ""
"packages while contrib and non-free contain things that have various "
"restrictions placed on their use and distribution."
msgstr ""
+"La liste des composants correspond à la liste des sous-ensemble de la "
+"distribution que l'on souhaite utiliser. Les distributions sont en général "
+"divisées ainsi pour des raisons de licences. La sous-distribution « main » "
+"comporte les paquets libre selon les principes du logiciel libre selon "
+"Debian (DFSG) alors que contrib et non-free correspondent à des éléments qui "
+"comprennent des restrictions de distribution ou d'utilisation."
#. type: <p></p>
#: guide.sgml:240
@@ -9679,16 +10126,32 @@ msgid ""
"Any number of sources can be added, the setup script will continue to prompt "
"until you have specified all that you want."
msgstr ""
+"Un nombre quelconque de sources peuvent être ajoutées. Le script de "
+"configuration continuera à les demander tant que vous n'indiquerez pas que "
+"le processus est terminé."
#. type: <p></p>
#: guide.sgml:247
+#, fuzzy
+#| msgid ""
+#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+#| "available list by selecting [U]pdate from the menu. This is a super-set "
+#| "of <tt>apt-get update</tt> that makes the fetched information available "
+#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
+#| "update</tt> has been run before."
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
msgstr ""
+"Avant d'utiliser <prgn>dselect</prgn>, il est nécessaire de mettre à jour la "
+"liste de ce qui est disponible en choisissant « [M]ise à jour » depuis le "
+"menu. Cette action exécutera la commande « apt-get update », ce qui rendra "
+"les informations récupérées disponibles pour <prgn>dselect</prgn>. Elle doit "
+"être utilisée même si la commande « apt-get » a déjà été utilisée sur ce "
+"système."
#. type: <p></p>
#: guide.sgml:253
@@ -9698,6 +10161,11 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
+"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]"
+"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour "
+"les installer. Lorsque la méthode APT est utilisée, les options « [C]"
+"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait "
+"l'ensemble des opérations."
#. type: <p></p>
#: guide.sgml:258
@@ -9706,11 +10174,15 @@ msgid ""
"have been successfully installed. To change this behavior place <tt>Dselect::"
"clean \"prompt\";</tt> in /etc/apt/apt.conf."
msgstr ""
+"Par défait, APT supprimera automatiquement les fichiers des paquets "
+"(fichiers .deb) une fois qu'ils ont été installés correctement. Pour "
+"modifier ce comportement, vous pouvez utiliser <tt>Dselect::clean \"prompt\";"
+"</tt> dans /etc/apt/apt.conf."
#. type: <heading></heading>
#: guide.sgml:264
msgid "The Interface"
-msgstr ""
+msgstr "L'interface"
#. type: <p></p>
#: guide.sgml:278
@@ -9724,11 +10196,20 @@ msgid ""
"then will print out some informative status messages so that you can "
"estimate how far along it is and how much is left to do."
msgstr ""
+"La méthode APT de <prgn>dselect</prgn> et le programme <prgn>apt-get</prgn> "
+"utilisent la même interface. Elle consiste en un système simple qui indique "
+"les opérations qui seront effectuées puis les réalise.<footnote><p>La "
+"méthode <prgn>dselect</prgn> consiste en fait en un jeu de scripts qui "
+"encapsulent <prgn>apt-get</prgn>. Cela approte des fonctionnalités "
+"supplémentaires à celles d'<prgn>apt-get</prgn> utilisé isolément.</p></"
+"footnote> Après avoir indiqué un résumé des opérations qui seront "
+"effectuées, APT donnera un certain nombre d'informations permettant "
+"d'estimer sa progression, tout au long des actions qu'il effectue. "
#. type: <heading></heading>
#: guide.sgml:280
msgid "Startup"
-msgstr ""
+msgstr "Démarrage"
#. type: <p></p>
#: guide.sgml:284
@@ -9738,6 +10219,10 @@ msgid ""
"At any time these operations can be performed by running <tt>apt-get check</"
"tt>."
msgstr ""
+"Avant toute opération autre qu'une mise à jour, APT effectue un certain "
+"nombre d'actions pour préparer ses mécaismes internes de fonctionnement. Il "
+"vérifie également l'état du système. Ces opérations peuvent être effectuées "
+"isolément avec la commande <tt>apt-get check</tt>."
#. type: <example></example>
#: guide.sgml:289
@@ -9747,6 +10232,9 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get check\n"
+"Lecture de la liste des paquets... Fait\n"
+"Construction de l'arbre des dépendances... Fait"
#. type: <p></p>
#: guide.sgml:297
@@ -9756,6 +10244,11 @@ msgid ""
"If some of the package files are not found then they will be ignored and a "
"warning will be printed when apt-get exits."
msgstr ""
+"En premier lieu, la liste des paquets est lue et placée en mémoire. APT "
+"utilise un mécanisme de cache et cette opération sera plus rapide si elle "
+"est effectuée une deuxième fois.Si certains des fichiers de paquets ne sont "
+"pas trouvés, ils seront ignorés et une informatique sera affichée quand apt-"
+"get se terminera."
#. type: <p></p>
#: guide.sgml:303
@@ -9765,6 +10258,10 @@ msgid ""
"package and considers if it is OK. Should this find a problem then a report "
"will be printed out and <prgn>apt-get</prgn> will refuse to run."
msgstr ""
+"Ensuite, une analyse détaillée des dépendances du système est réalisée. Les "
+"dépendances de chaque paquet installé ou décompressé sont vérifiées. Si un "
+"problème est trouvé, il sera affiché et <prgn>apt-get</prgn> bloquera des "
+"opérations ultérieures."
#. type: <example></example>
#: guide.sgml:320
@@ -9786,6 +10283,21 @@ msgid ""
" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
msgstr ""
+"# apt-get check\n"
+"Lecture de la liste des paquets... Fait\n"
+"Construction de l'arbre des dépendances.. Fait\n"
+"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n"
+"Les paquets suivants contiennent des dépendances non satisfaites :\n"
+" 9fonts: Depends: xlib6g mais il n'est pas installé\n"
+" uucp: Depends: mailx mais il n'est pas installé\n"
+" blast: Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+" adduser: Depends: perl-base mais il n'est pas installé\n"
+" aumix: Depends: libgpmg1 mais il n'est pas installé\n"
+" debiandoc-sgml: Depends: sgml-base mais il n'est pas installé\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 mais il n'est pas installé\n"
+" Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
#. type: <p></p>
#: guide.sgml:329
@@ -9796,6 +10308,10 @@ msgid ""
"that are unmet. A short explanation of why the package has a dependency "
"problem is also included."
msgstr ""
+"Dans cet exemple, le système comporte plusieurs problèmes, notamment un "
+"problème sérieux avec libreadline2g. Une ligne est affichée pour chaque "
+"paquet dont les dépendances ne sont pas satisfaites, indiquant quel est le "
+"problème. Une explication simple du problème est donnée."
#. type: <p></p>
#: guide.sgml:337
@@ -9808,6 +10324,14 @@ msgid ""
"situation a package may have been unpacked without its dependents being "
"installed."
msgstr ""
+"Il existe deux façons pour le système d'aboutir à cet état. Cela peut "
+"d'abord être causé par des subtilités de relations entre les paquets que "
+"<prgn>dpkg</prgn> aurait manquées lors de mises à jour. "
+"<footnote><p>Cependant, APT prend en compte les dépendances connues et "
+"s'efforce d'éviter que cette situation ne se produise</p></footnote>. Cela "
+"peut également être dû à l'échec antérieur d'une installation de paquet. "
+"Dans le cas présent, un paquet a pu être décompressé sans que ses "
+"dépendances ne soient satisfaites."
#. type: <p></p>
#: guide.sgml:345
@@ -9819,6 +10343,13 @@ msgid ""
"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
"for easy continuation of failed maintainer scripts."
msgstr ""
+"La seconde situation est moins grave que la première car APT met certaines "
+"contraintes sur l'ordre d'installation des paquets. Dans les deux cas, "
+"l'option <tt>-f</tt> utilisée avec <prgn>apt-get</prgn> conduira APT à "
+"rechercher une solution possible puis à continuer. La méthode APT de "
+"<prgn>dselect</prgn> utilise toujours cette option <tt>-f</tt> afin de "
+"pouvoir poursuivre plus facilement ses opérations si un script de mainteneur "
+"échoue de manière inopinée."
#. type: <p></p>
#: guide.sgml:351
@@ -9829,11 +10360,18 @@ msgid ""
"necessary to manually use dpkg (possibly with forcing options) to correct "
"the situation enough to allow APT to proceed."
msgstr ""
+"Cependant, si l'option <tt>-f</tt> est utilisée pour corriger un système "
+"fortement corrompu qui est dans le premier cas, il est possible que "
+"l'opération échoue immédiatement ou au cours des diverses tentatives de "
+"réparation effectuées. Dans tous les cas, il peut être nécessaire de "
+"corriger la situation manuellement avec dpkg (éventuellement en utilisant "
+"des options pour forcer certains opérations) avant de pouvoir utiliser à "
+"nouveau APT."
#. type: <heading></heading>
#: guide.sgml:356
msgid "The Status Report"
-msgstr ""
+msgstr "Le rapport d'état"
#. type: <p></p>
#: guide.sgml:363
@@ -9844,11 +10382,17 @@ msgid ""
"final state of things, taking into account the <tt>-f</tt> option and any "
"other relevant activities to the command being executed."
msgstr ""
+"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En "
+"général, ce rapport dépend du type d'opération qui est entreprise, mais de "
+"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans "
+"tous les cas, les listes reflètent l'état final du système, en tenant compte "
+"de l'option <tt>-f</tt> et des autres opérations découlant du type de "
+"commande utilisée."
#. type: <heading></heading>
#: guide.sgml:364
msgid "The Extra Package list"
-msgstr ""
+msgstr "La liste des paquets supplémentaires"
#. type: <example></example>
#: guide.sgml:372
@@ -9861,6 +10405,12 @@ msgid ""
" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
" ssh"
msgstr ""
+"Les paquets supplémentaires suivants seront installés :\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
#. type: <p></p>
#: guide.sgml:379
@@ -9870,11 +10420,15 @@ msgid ""
"generated for an <tt>install</tt> command. The listed packages are often the "
"result of an Auto Install."
msgstr ""
+"La liste des paquets supplémentaires montre tous les paquets installés ou "
+"mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît "
+"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés "
+"sont le résultat d'une installation automatique."
#. type: <heading></heading>
#: guide.sgml:382
msgid "The Packages to Remove"
-msgstr ""
+msgstr "Les paquets à supprimer"
#. type: <example></example>
#: guide.sgml:389
@@ -9886,6 +10440,11 @@ msgid ""
" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
" nas xpilot xfig"
msgstr ""
+"Les paquets suivants seront ENLEVÉS :\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
#. type: <p></p>
#: guide.sgml:399
@@ -9898,11 +10457,19 @@ msgid ""
"that are going to be removed because they are only partially installed, "
"possibly due to an aborted installation."
msgstr ""
+"La liste des paquets à enlever montre tous les paquets qui seront supprimés "
+"du système. Elle peut apparaître pour tout type d'opération. Il est "
+"conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet "
+"important ne va être supprimé. L'option <tt>-f</tt> provoque notamment "
+"souvent des suppressions de paquets et il est déconseillé d'être "
+"particulièrement attentif dans ce genre de cas. La liste peut comporter des "
+"paquets qui seront supprimés parce qu'ils sont seulement partiellement "
+"installés, par exemple après l'interruption d'une opération d'installation."
#. type: <heading></heading>
#: guide.sgml:402
msgid "The New Packages list"
-msgstr ""
+msgstr "La liste des nouveaux paquets"
#. type: <example></example>
#: guide.sgml:406
@@ -9911,6 +10478,8 @@ msgid ""
"The following NEW packages will installed:\n"
" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
msgstr ""
+"Les NOUVEAUX paquets suivants seront installés :\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
#. type: <p></p>
#: guide.sgml:411
@@ -9919,11 +10488,14 @@ msgid ""
"listed are not presently installed in the system but will be when APT is "
"done."
msgstr ""
+"La liste des nouveaux paquets est un simple rappel des opérations qui vont "
+"avoir lieu. Les paquets affichés ne sont pas encore présents sur le système "
+"mais le seront une fois qu'APT aura terminé."
#. type: <heading></heading>
#: guide.sgml:414
msgid "The Kept Back list"
-msgstr ""
+msgstr "La liste des paquets conservés"
#. type: <example></example>
#: guide.sgml:419
@@ -9933,6 +10505,9 @@ msgid ""
" compface man-db tetex-base msql libpaper svgalib1\n"
" gs snmp arena lynx xpat2 groff xscreensaver"
msgstr ""
+"Les paquets suivants ont été conservés :\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
#. type: <p></p>
#: guide.sgml:428
@@ -9944,11 +10519,18 @@ msgid ""
"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
"to resolve their problems."
msgstr ""
+"À chaque fois que le système entier est mis à jour, il est possible que de "
+"nouvelles versions de paquets ne puissent pas être installées car elles ont "
+"besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets "
+"existants. Ces paquets apparaîtront alors dans la liste des paquets "
+"conservés. Le meilleure méthode pour effectivement installer ces paquets est "
+"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> "
+"ou avec <prgn>dselect</prgn>."
#. type: <heading></heading>
#: guide.sgml:431
msgid "Held Packages warning"
-msgstr ""
+msgstr "L'avertissement pour paquets retenus"
#. type: <example></example>
#: guide.sgml:435
@@ -9957,6 +10539,8 @@ msgid ""
"The following held packages will be changed:\n"
" cvs"
msgstr ""
+"Les paquets retenus suivants seront changés :\n"
+" cvs"
#. type: <p></p>
#: guide.sgml:441
@@ -9965,17 +10549,20 @@ msgid ""
"case it prints out a warning that the held package is going to be changed. "
"This should only happen during dist-upgrade or install."
msgstr ""
+"Il peut parfois être utile de demander à APT d'installer un paquet retenu "
+"(« hold »). Dans ce cas, le programme affichera un avertissement indiquant "
+"que le paquet retenu va être modifié. Cela ne se produira que lors de "
+"l'utilisation des commandes dist-upgrade ou install."
#. type: <heading></heading>
#: guide.sgml:444
msgid "Final summary"
-msgstr ""
+msgstr "Résumé final"
#. type: <p></p>
#: guide.sgml:447
-msgid ""
-"Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
+msgid "Finally, APT will print out a summary of all the changes that will occur."
+msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
#. type: <example></example>
#: guide.sgml:452
@@ -9985,6 +10572,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
+"12 paquets partiellement installés ou enlevés.\n"
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
#. type: <p></p>
#: guide.sgml:470
@@ -10003,6 +10593,20 @@ msgid ""
"If a large number of packages are being removed then the value may indicate "
"the amount of space that will be freed."
msgstr ""
+"La première ligne de ce résumé est une version simplifiée de l'ensemble des "
+"listes et indique le nombre de mises à jour (paquets déjà installés et pour "
+"lesquels une nouvelle version est disponible). La deuxième ligne indique le "
+"nombre de paquets incorrectement configurés, en raison notamment "
+"d'installations interrompues. La dernière ligne indique l'espace disque "
+"nécessaire pour effectuer l'installation. Le premier couple de nombre fait "
+"référence à la taille des fichiers d'archive. Le premier nombre est le "
+"nombre d'octets à récupérer depuis les sites distants et le deuxième la "
+"taille totale de tous les fichiers nécessaires. Le nombre suivant représente "
+"la différence d'espace occupé entre les paquets installés actuellement et ce "
+"qui sera ensuite installé. Il est grossièrement égal à l'espace "
+"supplémentaire nécessaire dans /usr après achèvement de toutes les "
+"opérations. Si de nombreux paquets sont supprimés, cette valeur peut "
+"représenter l'espace qui est alors libéré."
#. type: <p></p>
#: guide.sgml:473
@@ -10010,11 +10614,13 @@ msgid ""
"Some other reports can be generated by using the -u option to show packages "
"to upgrade, they are similar to the previous examples."
msgstr ""
+"D'autres rapports peuvent être créés avec l'option -u qui affiche les "
+"paquets à mettre à jour. Il sont analogues aux exemples précédents."
#. type: <heading></heading>
#: guide.sgml:477
msgid "The Status Display"
-msgstr ""
+msgstr "L'affichage d'état"
#. type: <p></p>
#: guide.sgml:481
@@ -10022,6 +10628,8 @@ msgid ""
"During the download of archives and package files APT prints out a series of "
"status messages."
msgstr ""
+"Pendant le téléchargement des fichiers des paquets, APT affiche un certain "
+"nombre de messages d'avancement."
#. type: <example></example>
#: guide.sgml:490
@@ -10035,6 +10643,13 @@ msgid ""
"Get: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"
msgstr ""
+"# apt-get update\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
#. type: <p></p>
#: guide.sgml:500
@@ -10046,6 +10661,13 @@ msgid ""
"<tt>apt-get update</tt> estimates the percent done which causes some "
"inaccuracies."
msgstr ""
+"Les lignes qui débutent par « Réception de » sont affichées quand APT démarre "
+"la récupération d'un fichier alors que la dernière ligne indique la "
+"progression du téléchargement. La première valeur de pourcentage de la ligne "
+"est le pourcentage de téléchargement déjà effectué, pour l'ensemble des "
+"fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est "
+"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui "
+"peut conduire à des imprécisions."
#. type: <p></p>
#: guide.sgml:509
@@ -10058,6 +10680,14 @@ msgid ""
"The next word is the short form name of the object being downloaded. For "
"archives it will contain the name of the package that is being fetched."
msgstr ""
+"La section suivante de la ligne d'état est répétée pour chaque sous-tâche de "
+"téléchargement. Elle indique l'opération effectuée et d'autres informations "
+"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</"
+"em> ce qui indique que le système charge le module de téléchargement. Le "
+"premier mot après le crochet ouvrant ([) est le numéro d'ordre de "
+"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant "
+"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom "
+"du paquet en cours de récupération."
#. type: <p></p>
#: guide.sgml:524
@@ -10076,6 +10706,21 @@ msgid ""
"regularly and reflects the time to complete everything at the shown transfer "
"rate."
msgstr ""
+"À l'intérieur des guillemets, on trouve une information sur la progression "
+"de la phase de négociation du téléchargement. Usuellement, elle évolue de "
+"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</"
+"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés "
+"depuis le site distant. Une fois le téléchargement commencé, cette "
+"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets "
+"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale "
+"est toujours représentées sur 4 digits pour des raisons de place disponible. "
+"Après cet affichage de taille, se trouve une barre de progression pour le "
+"téléchargement du fichier lui-même. L'élément suivant est la vitesse "
+"instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et "
+"représente la vitesse de transfert pour cette période. Enfin, est affiché la "
+"temps de téléchargement restant estimé. Cette information est mise "
+"régulièrement à jour et représete la durée estimée de téléchargement de "
+"toute ce qui est nécessaire, à la vitesse affichée."
#. type: <p></p>
#: guide.sgml:530
@@ -10086,11 +10731,17 @@ msgid ""
"for logging to a file, use the <tt>-q</tt> option to remove the status "
"display."
msgstr ""
+"La ligne d'état est mise à jour chaque demi-seconde afin de fournir un "
+"retour régulier sur la progression du téléchargement alors que les lignes "
+"« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier est "
+"démarré. Comme l'état est mis à jour régulièrement, il ne peut pas servir "
+"pour la journalisation dans un fichier. Il est nécessaire d'utiliser "
+"l'option <tt>-q</tt> pour supprimer cet affichage."
#. type: <heading></heading>
#: guide.sgml:535
msgid "Dpkg"
-msgstr ""
+msgstr "Dpkg"
#. type: <p></p>
#: guide.sgml:542
@@ -10102,16 +10753,23 @@ msgid ""
"each question there is usually a description of what it is asking and the "
"questions are too varied to discuss completely here."
msgstr ""
+"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers "
+"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</"
+"prgn> peut poser un certain nombre de questions pendant le traitement des "
+"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de "
+"ces questions comporte un description de ce qui est attendu et elles sont "
+"trop variables d'un paquet à l'autre pour qu'une description détaillée soit "
+"donnée dans ce document."
#. type: <title></title>
#: offline.sgml:4
msgid "Using APT Offline"
-msgstr ""
+msgstr "Utilisation d'APT hors ligne"
#. type: <version></version>
#: offline.sgml:7
msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
+msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
#. type: <abstract></abstract>
#: offline.sgml:12
@@ -10119,23 +10777,24 @@ msgid ""
"This document describes how to use APT in a non-networked environment, "
"specifically a 'sneaker-net' approach for performing upgrades."
msgstr ""
+"Ce document décrit la méthode d'utilisation d'APT hors connexion à un "
+"réseau, et plus particulièrement une approche « sneaker-net » pour les mises "
+"à jour."
#. type: <copyrightsummary></copyrightsummary>
#: offline.sgml:16
msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1999."
#. type: <heading></heading>
#: offline.sgml:32
msgid "Introduction"
-msgstr ""
+msgstr "Introduction"
#. type: <heading></heading>
#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-#| msgid "OverrideDir"
msgid "Overview"
-msgstr "OverrideDir"
+msgstr "Aperçu"
#. type: <p></p>
#: offline.sgml:40
@@ -10145,6 +10804,10 @@ msgid ""
"machine is on a slow link, such as a modem and another machine has a very "
"fast connection but they are physically distant."
msgstr ""
+"Normalement, APT a besoin d'avoir un accès direct à une archive Debian, soit "
+"sur un support local, soit via le réseau. Un autre cas intéressant à traiter "
+"est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec "
+"une autre possédant une connexion à haut débit mais située à distance."
#. type: <p></p>
#: offline.sgml:51
@@ -10159,20 +10822,42 @@ msgid ""
"the machine downloading the packages, and <em>target host</em> the one with "
"bad or no connection."
msgstr ""
+"Une solution est d'utiliser un support amovible de grande taille tel qu'un "
+"disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien "
+"que ces supports ne disposent pas d'assez de place pour héberger une archive "
+"Debian complète, ils peuvent toutefois contenir un sous-ensemble de taille "
+"suffisante pour les besoins de nombreux utilisateurs. L'idée est alors "
+"d'utiliser APT pour créer une liste de paquets nécessaires, puis de les "
+"récupérer avec une machine disposant d'une bonne connectivité. Il est même "
+"possible d'utiliser soit une autre machine Debian avec APT soit un autre "
+"système d'exploitation et un outil de téléchargement tel que wget. Dans ce "
+"qui suit, <em>machine distante</em> désignera la machine qui télécharge les "
+"paquets et <em>machine cible</em>, celle qui a une connectivité limitée."
#. type: <p></p>
#: offline.sgml:57
+#, fuzzy
+#| msgid ""
+#| "This is achieved by creatively manipulating the APT configuration file. "
+#| "The essential premis to tell APT to look on a disc for it's archive "
+#| "files. Note that the disc should be formated with a filesystem that can "
+#| "handle long file names such as ext2, fat32 or vfat."
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
+"Il est nécessaire de manipuler le fichier de configuration d'APT de manière "
+"intelligente. Le préalable est d'indiquer à APT d'examiner le contenu d'un "
+"disque pour y trouver les fichiers d'archive. Ce disque doit utiliser un "
+"système de fichier autorisant les noms longs, par exemple ext2, fat32 ou "
+"vfat."
#. type: <heading></heading>
#: offline.sgml:63
msgid "Using APT on both machines"
-msgstr ""
+msgstr "Utilisation d'APT sur les deux machines"
#. type: <p><example>
#: offline.sgml:71
@@ -10182,6 +10867,11 @@ msgid ""
"remote machine to fetch the latest package files and decide which packages "
"to download. The disk directory structure should look like:"
msgstr ""
+"Si APT existe sur les deux machines, le cas est relativement simple. L'idée "
+"de base est de mettre une copie du fichier d'état sur le disque et "
+"d'utiliser la machine distante pour récupérer la dernière liste de paquets "
+"et choisir ceux à télécharger. La structure des répertoires du disque "
+"devraient ressembler à :"
#. type: <example></example>
#: offline.sgml:80
@@ -10196,13 +10886,19 @@ msgid ""
" sources.list\n"
" apt.conf"
msgstr ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
#. type: <heading></heading>
#: offline.sgml:88
-#, fuzzy
-#| msgid "User configuration"
msgid "The configuration file"
-msgstr "Configuration utilisateur"
+msgstr "Le fichier de configuration"
#. type: <p></p>
#: offline.sgml:96
@@ -10214,6 +10910,13 @@ msgid ""
"<em>target host</em>. Please note, if you are using a local archive you must "
"use copy URIs, the syntax is identical to file URIs."
msgstr ""
+"Le fichier de configuration indique à APT où conserver ses fichiers sur le "
+"disque et d'utiliser également les fichiers de configuration du disque. Le "
+"fichier sources.list devrait référencer les sites que vous souhaitez "
+"utiliser depuis la machine distante et le fichier d'état doit être une copie "
+"de <em>/var/lib/dpkg/status</em> de l'<em>ordinateur cible</em>. Veuillez "
+"noter que si sous utilisez une archive locale, les URI doivent en être "
+"copiés. La syntaxe est la même que celle des URI fichiers."
#. type: <p><example>
#: offline.sgml:100
@@ -10221,6 +10924,8 @@ msgid ""
"<em>apt.conf</em> must contain the necessary information to make APT use the "
"disc:"
msgstr ""
+"<em>apt.conf</em> doit avoir les informations nécessaires pour qu'APT "
+"utilise le disque.disc:"
#. type: <example></example>
#: offline.sgml:124
@@ -10250,6 +10955,29 @@ msgid ""
" Etc \"/disc/\";\n"
" };"
msgstr ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it tells\n"
+" the remote APT what architecture the target machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
#. type: </example></p>
#: offline.sgml:129
@@ -10257,16 +10985,32 @@ msgid ""
"More details can be seen by examining the apt.conf man page and the sample "
"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
msgstr ""
+"Plus d'informations peuvent être trouvées dans la page de manuel du fichier "
+"apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver "
+"dans <em>/usr/share/doc/apt/examples/apt.conf</em>."
#. type: <p><example>
#: offline.sgml:136
+#, fuzzy
+#| msgid ""
+#| "On the target machine the first thing to do is mount the disc and copy "
+#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
+#| "directories outlined in the Overview, <em>archives/partial/</em> and "
+#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
+#| "configure the sources.list. On the remote machine execute the following:"
msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
+"Sur la machine cible, il est d'abord nécessaire de monter le disque et y "
+"copier le fichier <em>/var/lib/dpkg/status</em>. Il sera aussi nécessaire de "
+"créer les répertoires dans l'aperçu (Overview), <em>archives/partial/</em> "
+"and <em>lists/partial/</em>. Connecter ensuite le disque à la machine "
+"distante et configurer le fichier sources.list. Sur la machine distante, "
+"exécuter la séquence de commandes suivante :"
#. type: <example></example>
#: offline.sgml:142
@@ -10278,15 +11022,30 @@ msgid ""
" # apt-get dist-upgrade\n"
" [ APT fetches all the packages needed to upgrade the target machine ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT récupère les fichiers des paquets ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
#. type: </example></p>
#: offline.sgml:149
+#, fuzzy
+#| msgid ""
+#| "The dist-upgrade command can be replaced with any-other standard APT "
+#| "commands, particularly dselect-upgrade. You can even use an APT front end "
+#| "such as <em>dselect</em> However this presents a problem in communicating "
+#| "your selections back to the local computer."
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
+"La commande dist-upgrade peut être remplacée par toute autres commande "
+"usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser "
+"une interface comme <em>dselect</em>. Cependant, cela complique la "
+"communication des choix vers l'ordinateur local."
#. type: <p><example>
#: offline.sgml:153
@@ -10294,6 +11053,9 @@ msgid ""
"Now the disc contains all of the index files and archives needed to upgrade "
"the target machine. Take the disc back and run:"
msgstr ""
+"Après cette opération, le disque contiendra tous les fichiers d'index et les "
+"archives nécessaires pour mettr eà jour la machine cible. Il est alors "
+"possible d'y ramener le disque et exécuter :"
#. type: <example></example>
#: offline.sgml:159
@@ -10305,6 +11067,11 @@ msgid ""
" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
" [ Or any other APT command ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT crée la copie locale des fichiers de cache ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Ou toute autre commande APT ]"
#. type: <p></p>
#: offline.sgml:165
@@ -10312,6 +11079,8 @@ msgid ""
"It is necessary for proper function to re-specify the status file to be the "
"local one. This is very important!"
msgstr ""
+"Pour un fonctionnement correct, il est indispensable de ré-indiquer que le "
+"fichier d'état est le fichier local. Cela est très important."
#. type: <p></p>
#: offline.sgml:172
@@ -10322,11 +11091,17 @@ msgid ""
"the local machine - but this may not always be possible. DO NOT copy the "
"status file if dpkg or APT have been run in the mean time!!"
msgstr ""
+"Si vous utilisez dselect, vous pouvez effectuer l'opération dangereuse "
+"consistant à copier disc/status en /var/lib/dpkg/status, afin que les choix "
+"effectués sur la machine distante soient mis à jour. Il est recommandé de "
+"n'éffectuer les choix que sur la machine locale, mais ce n'est pas toujours "
+"possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés "
+"dans l'intervalle."
#. type: <heading></heading>
#: offline.sgml:178
msgid "Using APT and wget"
-msgstr ""
+msgstr "Utilisation d'APT et wget"
#. type: <p></p>
#: offline.sgml:185
@@ -10335,6 +11110,10 @@ msgid ""
"any machine. Unlike the method above this requires that the Debian machine "
"already has a list of available packages."
msgstr ""
+"<em>wget</em> est un outil classique de téléchargement qui peut être exécuté "
+"sur à peu près tout type de machine. À la différence de la méthode "
+"précédente, cela impose que la machine Debian a déjà une liste des paquets "
+"disponibles."
#. type: <p></p>
#: offline.sgml:190
@@ -10344,13 +11123,15 @@ msgid ""
"option to apt-get and then preparing a wget script to actually fetch the "
"packages."
msgstr ""
+"L'idée de base est de créer un disque qui ne comporte que les fichiers "
+"archive téléchargés depuis le site distant. Cela peut être effectué avec "
+"l'option --print-uris d'apt-get puis de la préparation d'un script wget "
+"permettant de récupérer les paquets/"
#. type: <heading></heading>
#: offline.sgml:196
-#, fuzzy
-#| msgid "Options"
msgid "Operation"
-msgstr "Options"
+msgstr "Fonctionnement"
#. type: <p><example>
#: offline.sgml:200
@@ -10358,6 +11139,9 @@ msgid ""
"Unlike the previous technique no special configuration files are required. "
"We merely use the standard APT commands to generate the file list."
msgstr ""
+"À la différence de la méthode précédente, aucun fichier de configuration "
+"spécifique n'est nécessaire. Seules les commandes standard d'APT seront "
+"utilisées pour créer la liste de ficheirs."
#. type: <example></example>
#: offline.sgml:205
@@ -10368,6 +11152,10 @@ msgid ""
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
+" # apt-get dist-upgrade \n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
#. type: </example></p>
#: offline.sgml:210
@@ -10375,6 +11163,8 @@ msgid ""
"Any command other than dist-upgrade could be used here, including dselect-"
"upgrade."
msgstr ""
+"Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-"
+"upgrade."
#. type: <p></p>
#: offline.sgml:216
@@ -10384,11 +11174,15 @@ msgid ""
"with the current directory as the disc's mount point so as to save the "
"output on the disc."
msgstr ""
+"Le fichier /disc/wget-script contiendra alors la liste des commandes wget à "
+"exécuter afin de récupérer les fichiers nécessaires. Ce script doit être "
+"exécuté depuis le point de montage du disque afin que les fichiers soient "
+"écrits sur le disque."
#. type: <p><example>
#: offline.sgml:219
msgid "The remote machine would do something like"
-msgstr ""
+msgstr "Sur la machine distante, il faudra alors exécuter l'équivalent de :"
#. type: <example></example>
#: offline.sgml:223
@@ -10398,6 +11192,9 @@ msgid ""
" # sh -x ./wget-script\n"
" [ wait.. ]"
msgstr ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ attendre.. ]"
#. type: </example><example>
#: offline.sgml:228
@@ -10405,17 +11202,49 @@ msgid ""
"Once the archives are downloaded and the disc returned to the Debian machine "
"installation can proceed using,"
msgstr ""
+"Une fois les fichiers téléchargés et le disque reconnecté à la machine "
+"Debian, l'installation peut se poursuivre avec :"
#. type: <example></example>
#: offline.sgml:230
#, no-wrap
msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
+msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
#. type: </example></p>
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
-msgstr ""
+msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+
+#~ msgid "Keyring of local trusted keys, new keys will be added here."
+#~ msgstr ""
+#~ "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
+
+#~ msgid ""
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "Le fichier <filename>apt.conf</filename> est le principal fichier de "
+#~ "configuration de la collection d'outils que constitue APT ; tous les "
+#~ "outils font appel à ce fichier de configuration et utilisent un analyseur "
+#~ "syntaxique en ligne de commande commun afin de fournir un environnement "
+#~ "uniforme. Quand un outil d'APT démarre, il lit la configuration désignée "
+#~ "par variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), "
+#~ "puis il lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> "
+#~ "ainsi que le principal fichier de configuration indiqué par <literal>Dir::"
+#~ "Etc::main</literal> ; enfin il applique les options de la ligne de "
+#~ "commande qui prévalent sur les directives de configuration, chargeant si "
+#~ "nécessaire d'autres fichiers de configuration."
#~ msgid ""
#~ "Disable Immediate Configuration; This dangerous option disables some of "
@@ -10450,13 +11279,6 @@ msgstr ""
#~ msgid "<filename>/etc/apt/apt.conf</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-#~ msgid ""
-#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-#~ "literal>."
-#~ msgstr ""
-#~ "Fichier de configuration d'APT. Élément de configuration : <literal>Dir::"
-#~ "Etc::Main</literal>."
-
#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
diff --git a/doc/po/it.po b/doc/po/it.po
index 37cf5d078..fd2e2994e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -739,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -749,6 +749,61 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, 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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -812,7 +867,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1203,7 +1258,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1397,14 +1452,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1415,9 +1470,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1429,7 +1484,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1529,7 +1584,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr ""
@@ -1729,7 +1784,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2263,7 +2318,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2375,20 +2430,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2682,12 +2739,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -2696,26 +2772,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2786,7 +2862,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
#, fuzzy
msgid "update"
msgstr "upgrade"
@@ -3116,15 +3192,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3379,7 +3455,7 @@ msgstr ""
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3596,13 +3672,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3610,17 +3687,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3628,117 +3705,135 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -4187,7 +4282,7 @@ msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4209,18 +4304,54 @@ msgstr ""
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4230,7 +4361,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4246,7 +4377,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4258,7 +4389,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4266,27 +4397,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
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 ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -4296,7 +4427,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -4308,7 +4439,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -4318,7 +4449,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4329,7 +4460,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4346,24 +4477,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4371,12 +4502,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4385,24 +4516,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4411,12 +4542,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4432,13 +4563,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -4449,12 +4580,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4465,87 +4596,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4555,36 +4697,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4595,7 +4737,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4609,7 +4751,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4617,7 +4759,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4629,7 +4771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4639,7 +4781,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4647,12 +4789,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4662,7 +4804,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4683,12 +4825,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4707,7 +4849,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4717,7 +4859,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4726,7 +4868,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4736,18 +4878,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4760,12 +4902,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4773,18 +4915,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4796,19 +4938,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4825,13 +4967,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4846,7 +4988,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4856,36 +4998,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4894,7 +5036,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -4903,19 +5045,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4927,7 +5069,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4940,7 +5082,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4950,7 +5092,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -4958,7 +5100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4969,7 +5111,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4982,13 +5124,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
#, fuzzy
msgid "APT in DSelect"
msgstr "DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4996,12 +5138,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5012,50 +5154,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
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:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
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:507
+#: apt.conf.5.xml:525
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 "
@@ -5063,17 +5205,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -5082,12 +5224,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -5097,7 +5239,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5107,36 +5249,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
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:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5151,7 +5293,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5161,7 +5303,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -5175,12 +5317,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -5192,12 +5334,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5213,12 +5355,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5229,12 +5371,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5244,12 +5386,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5261,12 +5403,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5278,7 +5420,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5292,12 +5434,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5306,12 +5448,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5322,7 +5464,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5330,7 +5472,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5338,7 +5480,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5348,111 +5490,111 @@ 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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -5460,93 +5602,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
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><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
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><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
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><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5556,12 +5698,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5578,91 +5720,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
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><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
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><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
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><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
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><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -5670,32 +5812,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5747,25 +5889,36 @@ msgid ""
"choice of instance, only the choice of version."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5781,40 +5934,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -5822,7 +5975,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5830,14 +5983,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5847,19 +6000,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5867,7 +6020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5877,7 +6030,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5886,7 +6039,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5898,12 +6051,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5912,7 +6065,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -5922,7 +6075,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5931,7 +6084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5941,7 +6094,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5949,7 +6102,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -5958,7 +6111,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -5968,7 +6121,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5976,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -5985,7 +6138,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -5993,7 +6146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -6002,7 +6155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6010,7 +6163,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -6019,82 +6172,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6102,7 +6255,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6111,14 +6264,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6135,12 +6288,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6150,7 +6303,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6158,7 +6311,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6167,12 +6320,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6180,27 +6333,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6213,12 +6366,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6229,18 +6382,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6250,13 +6403,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6266,7 +6419,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6275,12 +6428,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6291,18 +6444,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6311,18 +6464,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6331,13 +6484,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6350,7 +6503,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6365,12 +6518,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6378,7 +6531,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6387,12 +6540,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6407,7 +6560,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6417,8 +6570,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6427,7 +6580,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6436,13 +6589,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6451,12 +6604,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -6473,7 +6626,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6484,7 +6637,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6493,13 +6646,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6511,12 +6664,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6536,7 +6689,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6551,7 +6704,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6560,13 +6713,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6578,12 +6731,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6812,7 +6965,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6820,9 +6973,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -7075,7 +7228,7 @@ msgstr ""
#, fuzzy
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7315,8 +7468,8 @@ msgstr ""
#: guide.sgml:184
#, fuzzy
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"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 "
@@ -7456,7 +7609,7 @@ msgstr ""
#, fuzzy
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -8169,7 +8322,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -8267,8 +8420,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
#. type: <example></example>
@@ -8285,9 +8438,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index ba04b200f..f1a766d97 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1061,7 +1061,7 @@ msgstr "&sources-list; ã«æŒ‡å®šã—ãŸã€ãƒ‘ッケージリソースã”ã¨ã®çŠ¶
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, fuzzy, no-wrap
#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
msgid ""
@@ -1072,6 +1072,69 @@ msgid ""
"\">\n"
msgstr "å–得中状態情報格ç´ã‚¨ãƒªã‚¢ã€‚設定項目 - <literal>Dir::State::Lists</literal> (必然的ã«ä¸å®Œå…¨)"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Plain text
+#: apt.ent:362
+#, fuzzy, no-wrap
+#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr "&sources-list; ã«æŒ‡å®šã—ãŸã€ãƒ‘ッケージリソースã”ã¨ã®çŠ¶æ…‹æƒ…報格ç´ã‚¨ãƒªã‚¢ã€‚設定項目 - <literal>Dir::State::Lists</literal>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, no-wrap
+#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr "å–得中状態情報格ç´ã‚¨ãƒªã‚¢ã€‚設定項目 - <literal>Dir::State::Lists</literal> (必然的ã«ä¸å®Œå…¨)"
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"訳者\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, 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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" 倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),\n"
+" Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1160,7 +1223,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1724,7 +1787,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "オプション"
@@ -1966,15 +2029,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr "ファイル"
@@ -1986,9 +2049,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -2002,7 +2065,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2140,7 +2203,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr "オプション"
@@ -2403,7 +2466,7 @@ msgstr "設定箇所ã®å†…容を表示ã™ã‚‹ã ã‘ã§ã™ã€‚"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3166,8 +3229,12 @@ msgstr "Sources"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
+#, fuzzy
+#| msgid ""
+#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+#| "source/Sources</filename>"
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
"Packages ファイルã®å‡ºåŠ›å…ˆã‚’設定ã—ã¾ã™ã€‚デフォルト㯠<filename>$(DIST)/"
@@ -3318,29 +3385,39 @@ msgstr ""
"<literal>TreeDefault</literal> セクションã§å®šç¾©ã•ã‚Œã‚‹è¨­å®šã¯ã™ã¹ã¦ã€3 個ã®æ–°ã—"
"ã„変数ã¨åŒæ§˜ã«ã€<literal>Tree</literal> セクションã§ä½¿ç”¨ã§ãã¾ã™ã€‚"
-# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"<literal>Tree</literal> セクションを処ç†ã™ã‚‹éš›ã€<command>apt-ftparchive</"
-"command> ã¯ä»¥ä¸‹ã®ã‚ˆã†ãªæ“作を行ã„ã¾ã™ã€‚"
-
# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "for i in Sections do \n"
+#| " for j in Architectures do\n"
+#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
msgstr ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+#, fuzzy
+#| msgid ""
+#| "When processing a <literal>Tree</literal> section <command>apt-"
+#| "ftparchive</command> performs an operation similar to:"
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"<literal>Tree</literal> セクションを処ç†ã™ã‚‹éš›ã€<command>apt-ftparchive</"
+"command> ã¯ä»¥ä¸‹ã®ã‚ˆã†ãªæ“作を行ã„ã¾ã™ã€‚"
+
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
@@ -3723,12 +3800,33 @@ msgstr ""
#: apt-ftparchive.1.xml:547
#, fuzzy
#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+#, fuzzy
+#| msgid "<option>--version</option>"
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -3738,21 +3836,21 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, 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"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3762,7 +3860,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3903,7 +4001,7 @@ msgstr ""
"&gnome-apt;, &wajig; ãªã©ãŒã‚ã‚Šã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr "update"
@@ -4366,18 +4464,31 @@ msgstr "<option>--fix-broken</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:334
+#, fuzzy
+#| msgid ""
+#| "Fix; attempt to correct a system with broken dependencies in place. This "
+#| "option, when used with install/remove, can omit any packages to permit "
+#| "APT to deduce a likely solution. Any Package that are specified must "
+#| "completely correct the problem. The option is sometimes necessary when "
+#| "running APT for the first time; APT itself does not allow broken package "
+#| "dependencies to exist on a system. It is possible that a system's "
+#| "dependency structure can be so corrupt as to require manual intervention "
+#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
+#| "to eliminate some of the offending packages). Use of this option together "
+#| "with <option>-m</option> may produce an error in some situations. "
+#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"修復 - ä¾å­˜é–¢ä¿‚ãŒå£Šã‚ŒãŸã‚·ã‚¹ãƒ†ãƒ ã®ä¿®æ­£ã‚’試ã¿ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションを install ã‚„ "
"remove ã¨ä¸€ç·’ã«ä½¿ã†ã¨ãã¯ã€ãƒ‘ッケージを指定ã—ãªãã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。ã©ã®ãƒ‘ッ"
@@ -4710,10 +4821,17 @@ msgstr "<option>--purge</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:467
+#, fuzzy
+#| msgid ""
+#| "Use purge instead of remove for anything that would be removed. An "
+#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
+#| "to be purged. <option>remove --purge</option> is equivalent for "
+#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
+#| "Purge</literal>."
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
"削除ã™ã‚‹éš›ã€ã€Œå‰Šé™¤ã€ã§ã¯ãªã「完全削除ã€ã‚’è¡Œã„ã¾ã™ã€‚「完全削除ã€ã‚’è¡Œã†ã¨æŒ‡ç¤º"
@@ -4991,8 +5109,14 @@ msgstr "APT キー管ç†ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#| "option></arg>"
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
@@ -5002,7 +5126,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -5014,19 +5138,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr "コマンド"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>filename</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -5038,70 +5162,70 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>keyid</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr "信頼キー一覧ã‹ã‚‰ã‚­ãƒ¼ã‚’削除ã—ã¾ã™ã€‚"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr "export <replaceable>keyid</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr "キー <replaceable>keyid</replaceable> を標準出力ã«å‡ºåŠ›ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr "exportall"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr "ä¿¡é ¼ã™ã‚‹ã‚­ãƒ¼ã‚’ã™ã¹ã¦æ¨™æº–出力ã«å‡ºåŠ›ã—ã¾ã™ã€‚"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr "list"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr "信頼キーを一覧表示ã—ã¾ã™ã€‚"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr "finger"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr "信頼キーã®ãƒ•ã‚£ãƒ³ã‚¬ãƒ¼ãƒ—リントを一覧表示ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
@@ -5111,7 +5235,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -5119,43 +5243,62 @@ msgstr ""
"Debian アーカイブキーã§ã€ãƒ­ãƒ¼ã‚«ãƒ«ã‚­ãƒ¼ãƒªãƒ³ã‚°ã‚’æ›´æ–°ã—ã€ã‚‚ã†æœ‰åŠ¹ã§ãªã„キーをキー"
"リングã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+#, fuzzy
+#| msgid "add <replaceable>filename</replaceable>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>filename</replaceable>"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
-msgstr "ローカル信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã€‚æ–°ã—ã„キーã¯ã“ã“ã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚"
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
+msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr "アーカイブキーã®ãƒ­ãƒ¼ã‚«ãƒ«ä¿¡é ¼ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr "Debian アーカイブ信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã§ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
@@ -5163,13 +5306,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr "削除ã•ã‚ŒãŸ Debian アーカイブ信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã§ã™ã€‚"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
@@ -5856,7 +5999,7 @@ msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5880,31 +6023,64 @@ msgstr "5"
msgid "Configuration file for APT"
msgstr "APT ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«"
-# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> ã¯ã€APT ツール集ã®ãƒ¡ã‚¤ãƒ³è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚ã“ã®"
-"設定ファイルã¨å…±é€šã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ‘ーサを使ã£ã¦ã€ã™ã¹ã¦ã®ãƒ„ールを統一環境ã§"
-"使用ã§ãã¾ã™ã€‚APT ツールã®èµ·å‹•æ™‚ã«ã¯ã€<envar>APT_CONFIG</envar> 環境変数ã«æŒ‡"
-"定ã—ãŸè¨­å®šã‚’ (存在ã™ã‚Œã°) 読ã¿è¾¼ã¿ã¾ã™ã€‚次㫠<literal>Dir::Etc::Parts</"
-"literal> ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã¾ã™ã€‚次㫠<literal>Dir::Etc::main</literal> ã§"
-"指定ã—ãŸä¸»è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã€æœ€å¾Œã«ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ションã§ã€è¨­å®šãƒ•ã‚¡"
-"イルよりå–å¾—ã—ãŸå€¤ã‚’上書ãã—ã¾ã™ã€‚"
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+#, fuzzy
+#| msgid ""
+#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
+#| "literal>."
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
#, fuzzy
#| msgid ""
#| "The configuration file is organized in a tree with options organized into "
@@ -5926,7 +6102,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
#, fuzzy
#| msgid ""
#| "Syntactically the configuration language is modeled after what the ISC "
@@ -5959,7 +6135,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -5978,7 +6154,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5990,14 +6166,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -6006,7 +6182,7 @@ msgstr ""
"定ファイルã®ã‚µãƒ³ãƒ—ルã§ã™ã€‚ã©ã®ã‚ˆã†ã«è¨­å®šã™ã‚‹ã‹å‚考ã«ãªã‚‹ã§ã—ょã†ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -6015,7 +6191,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal> ã¨ã§ãã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -6026,7 +6202,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
#, fuzzy
#| msgid ""
#| "Two specials are allowed, <literal>#include</literal> and "
@@ -6051,7 +6227,7 @@ msgstr ""
"指定ã—ãŸè¦ç´ ã¨ã€ãれ以下ã®è¦ç´ ã‚’削除ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -6062,7 +6238,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
#, fuzzy
#| msgid ""
#| "All of the APT tools take a -o option which allows an arbitrary "
@@ -6084,7 +6260,7 @@ msgstr ""
"ã‚‹ã“ã¨ã§ã€ãƒªã‚¹ãƒˆã‚’追加ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -6102,13 +6278,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr "APT グループ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -6118,13 +6294,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr "Architecture"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -6136,12 +6312,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -6154,13 +6330,13 @@ msgstr ""
"ã™ã€‚ &apt-preferences; ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -6170,13 +6346,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr "Clean-Installed"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -6191,12 +6367,12 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6212,13 +6388,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -6229,13 +6405,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6253,13 +6429,13 @@ msgstr ""
"ä¸å¯æ¬ ãƒ‘ッケージã§å‹•ä½œã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr "Cache-Limit"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6268,24 +6444,24 @@ msgstr ""
"ファイルを使用ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションã¯ã€ãã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚µã‚¤ã‚ºã‚’指定ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr "Build-Essential"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築ä¾å­˜é–¢ä¿‚ã§ä¸å¯æ¬ ãªãƒ‘ッケージを定義ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr "Get"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6294,13 +6470,13 @@ msgstr ""
"&apt-get; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr "Cache"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6309,13 +6485,13 @@ msgstr ""
"㯠&apt-cache; ã®æ–‡æ›¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr "CDROM"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6325,17 +6501,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6344,14 +6520,25 @@ msgstr ""
"<literal>PDiffs</literal> ã¨å‘¼ã°ã‚Œã‚‹å·®åˆ†ã‚’ダウンロードã—よã†ã¨ã—ã¾ã™ã€‚デフォ"
"ルトã§ã¯ True ã§ã™ã€‚"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr "Queue-Mode"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6366,13 +6553,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr "Retries"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6381,13 +6568,13 @@ msgstr ""
"ãˆã‚‰ã‚ŒãŸå›žæ•°ã ã‘リトライを行ã„ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6398,13 +6585,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
#, fuzzy
#| msgid ""
#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -6430,7 +6617,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6455,7 +6642,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6467,7 +6654,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
#, fuzzy
#| msgid ""
#| "One setting is provided to control the pipeline depth in cases where the "
@@ -6495,7 +6682,7 @@ msgstr ""
"ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6505,7 +6692,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6514,12 +6701,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
#, fuzzy
#| msgid ""
#| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6537,7 +6724,7 @@ msgstr ""
"ã—ã¦ã„ã¾ã›ã‚“。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6559,13 +6746,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
#, fuzzy
#| msgid ""
#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
@@ -6608,7 +6795,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6624,7 +6811,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6638,7 +6825,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6655,12 +6842,12 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, fuzzy, no-wrap
#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
@@ -6668,7 +6855,7 @@ msgstr "\"/cdrom/\"::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6689,13 +6876,13 @@ msgstr ""
"ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr "gpgv"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6706,18 +6893,18 @@ msgstr ""
"ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6729,19 +6916,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6758,13 +6945,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6779,7 +6966,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6789,36 +6976,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6827,7 +7014,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -6837,7 +7024,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6848,13 +7035,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6874,7 +7061,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6896,7 +7083,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6911,7 +7098,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -6923,7 +7110,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
#, fuzzy
#| msgid ""
#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
@@ -6948,7 +7135,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6969,13 +7156,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr "DSelect ã§ã® APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6985,13 +7172,13 @@ msgstr ""
"設定項目ã§ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®å‹•ä½œã‚’制御ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr "Clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -7008,7 +7195,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -7018,13 +7205,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr "Updateoptions"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -7033,13 +7220,13 @@ msgstr ""
"ã•ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -7049,13 +7236,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr "APT ㌠dpkg を呼ã¶æ–¹æ³•"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -7065,7 +7252,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
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 "
@@ -7075,18 +7262,18 @@ msgstr ""
"ã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ã¾ãŸã€å„リストã¯å˜ä¸€ã®å¼•æ•°ã¨ã—㦠&dpkg; ã«æ¸¡ã•ã‚Œã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr "Post-Invoke"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -7100,13 +7287,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -7122,7 +7309,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -7138,13 +7325,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr "Run-Directory"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -7154,13 +7341,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr "Build-options"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -7169,12 +7356,12 @@ msgstr ""
"ã¾ã™ã€‚デフォルトã§ã¯ç½²åを無効ã«ã—ã€å…¨ãƒã‚¤ãƒŠãƒªã‚’生æˆã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7189,7 +7376,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7199,7 +7386,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -7213,12 +7400,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -7231,14 +7418,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
#, fuzzy
#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7255,13 +7442,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
#, fuzzy
msgid "DPkg::ConfigurePending"
msgstr "ユーザã®è¨­å®š"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7272,12 +7459,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7287,12 +7474,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7304,12 +7491,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7321,7 +7508,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7335,12 +7522,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr "Periodic オプション㨠Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7354,12 +7541,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr "デãƒãƒƒã‚°ã‚ªãƒ—ション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7370,7 +7557,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7381,7 +7568,7 @@ msgstr ""
"ã«ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7392,7 +7579,7 @@ msgstr ""
"literal>) ã‚’è¡Œã†å ´åˆã«ä½¿ç”¨ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7402,66 +7589,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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用ã„ãŸãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用ã„ãŸãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用ã„ãŸãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7469,46 +7656,46 @@ msgstr ""
"<literal>gpg</literal> を用ã„ãŸæš—å·ç½²åã®æ¤œè¨¼ã«é–¢ã™ã‚‹æƒ…報を出力ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -7516,93 +7703,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
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><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
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><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
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><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7612,12 +7799,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7634,91 +7821,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
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><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
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><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
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><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
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><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -7726,12 +7913,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7739,7 +7926,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7749,7 +7936,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
#, fuzzy
#| msgid "&apt-conf;"
msgid "&file-aptconf;"
@@ -7758,7 +7945,7 @@ msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7835,29 +8022,40 @@ msgstr ""
"ダウンロードã—ã¾ã™ã€‚APT 設定ファイルã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®é¸æŠžã«ã®ã¿å½±éŸ¿ã—ã€ã‚¤ãƒ³ã‚¹ã‚¿"
"ンスã®é¸æŠžã«ã¯å½±éŸ¿ã—ã¾ã›ã‚“。"
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr "APT ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå„ªå…ˆåº¦ã®å‰²ã‚Šå½“ã¦"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -7882,25 +8080,25 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr "priority 100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr "(ã‚ã‚‹ãªã‚‰ã°) æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€‚"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr "priority 500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7908,20 +8106,20 @@ msgstr "インストールã•ã‚Œã¦ãŠã‚‰ãšã€ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒªãƒªãƒ¼ã‚¹ã«å«
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr "priority 990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr "インストールã•ã‚Œã¦ãŠã‚‰ãšã€ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒªãƒªãƒ¼ã‚¹ã«å«ã¾ã‚Œã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€‚"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -7933,7 +8131,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -7945,7 +8143,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7955,7 +8153,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7971,13 +8169,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr "最も高ã„優先度ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’インストールã—ã¾ã™ã€‚"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7987,7 +8185,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7999,7 +8197,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -8015,7 +8213,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -8029,7 +8227,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -8049,13 +8247,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr "APT 設定ã®åŠ¹æžœ"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8068,7 +8266,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -8083,7 +8281,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8096,7 +8294,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -8111,7 +8309,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -8123,7 +8321,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -8136,7 +8334,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -8152,7 +8350,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8163,7 +8361,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -8176,7 +8374,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8187,7 +8385,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -8200,7 +8398,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8212,7 +8410,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -8225,18 +8423,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr "APT ãŒå„ªå…ˆåº¦ã«å‰²ã‚Šè¾¼ã‚€æ–¹æ³•"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8244,13 +8442,13 @@ msgstr ""
"パッケージãŒãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8259,13 +8457,13 @@ msgstr ""
"å«ã¾ã‚Œãªãã¦ã‚‚ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -8274,13 +8472,13 @@ msgstr ""
"ジョンã®æ–¹ãŒæ–°ã—ã„ã®ã§ãªã‘ã‚Œã°ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -8290,13 +8488,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8305,19 +8503,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr "P &lt; 0"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr "ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ç¦æ­¢"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8329,7 +8527,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8343,7 +8541,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8353,7 +8551,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8382,13 +8580,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr "ã™ã‚‹ã¨ã€ä»¥ä¸‹ã®ã‚ˆã†ã«å‹•ä½œã—ã¾ã™ã€‚"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -8403,7 +8601,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8415,7 +8613,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8429,13 +8627,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションプロパティã®æ±ºå®š"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8446,30 +8644,30 @@ msgstr ""
"filename> ファイルをæä¾›ã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr "パッケージå"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr "ãã®åå‰ã®ãƒ‘ッケージã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8489,13 +8687,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -8513,19 +8711,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8542,14 +8740,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -8565,7 +8763,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8577,13 +8775,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8601,19 +8799,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8626,19 +8824,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8651,14 +8849,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8680,7 +8878,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8706,13 +8904,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードã®ã‚ªãƒ—ション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8723,7 +8921,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8737,13 +8935,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr "安定版ã®è¿½è·¡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8768,7 +8966,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -8784,8 +8982,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8798,7 +8996,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8811,14 +9009,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8832,13 +9030,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr "テスト版やä¸å®‰å®šç‰ˆã®è¿½è·¡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -8867,7 +9065,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -8885,7 +9083,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8898,14 +9096,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8924,13 +9122,13 @@ msgstr ""
"ã®æœ€æ–°ç‰ˆã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8964,7 +9162,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8980,7 +9178,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8993,14 +9191,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9020,7 +9218,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
#, fuzzy
#| msgid "apt_preferences"
msgid "&file-preferences;"
@@ -9028,7 +9226,7 @@ msgstr "apt_preferences"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9411,7 +9609,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -9419,9 +9617,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -9683,7 +9881,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -9832,8 +10030,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"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 "
@@ -9921,7 +10119,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -10415,7 +10613,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -10550,8 +10748,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
# type: <example></example>
@@ -10574,9 +10772,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
@@ -10717,6 +10915,34 @@ msgstr ""
msgid "Which will use the already fetched archives on the disc."
msgstr ""
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "<filename>apt.conf</filename> ã¯ã€APT ツール集ã®ãƒ¡ã‚¤ãƒ³è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚ã“"
+#~ "ã®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã¨å…±é€šã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ‘ーサを使ã£ã¦ã€ã™ã¹ã¦ã®ãƒ„ールを統一環"
+#~ "境ã§ä½¿ç”¨ã§ãã¾ã™ã€‚APT ツールã®èµ·å‹•æ™‚ã«ã¯ã€<envar>APT_CONFIG</envar> 環境変"
+#~ "æ•°ã«æŒ‡å®šã—ãŸè¨­å®šã‚’ (存在ã™ã‚Œã°) 読ã¿è¾¼ã¿ã¾ã™ã€‚次㫠<literal>Dir::Etc::"
+#~ "Parts</literal> ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã¾ã™ã€‚次㫠<literal>Dir::Etc::main</"
+#~ "literal> ã§æŒ‡å®šã—ãŸä¸»è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’読ã¿è¾¼ã¿ã€æœ€å¾Œã«ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ショ"
+#~ "ンã§ã€è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚ˆã‚Šå–å¾—ã—ãŸå€¤ã‚’上書ãã—ã¾ã™ã€‚"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Keyring of local trusted keys, new keys will be added here."
+#~ msgstr "ローカル信頼キーã®ã‚­ãƒ¼ãƒªãƒ³ã‚°ã€‚æ–°ã—ã„キーã¯ã“ã“ã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚"
+
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#~ msgid ""
#~ "Disable Immediate Configuration; This dangerous option disables some of "
@@ -10759,12 +10985,6 @@ msgstr ""
#~ msgid "<filename>/etc/apt/apt.conf</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-#~ "literal>."
-#~ msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
-
# type: Content of: <refentry><refsect1><para>
#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 27b7a8a7b..a3936cff2 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2004-02-12 15:06+0100\n"
"Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -739,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -749,6 +749,61 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, 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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -811,7 +866,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
#, fuzzy
@@ -1203,7 +1258,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
#, fuzzy
msgid "options"
msgstr "Kolejne kroki"
@@ -1398,14 +1453,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1416,9 +1471,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1430,7 +1485,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1530,7 +1585,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
#, fuzzy
msgid "Options"
msgstr "Kolejne kroki"
@@ -1732,7 +1787,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2267,7 +2322,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2379,20 +2434,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2688,12 +2745,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -2702,26 +2778,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2791,7 +2867,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr ""
@@ -3116,15 +3192,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3379,7 +3455,7 @@ msgstr ""
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3595,13 +3671,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3609,17 +3686,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3627,117 +3704,135 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -4188,7 +4283,7 @@ msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4211,18 +4306,54 @@ msgstr "Plik konfiguracyjny"
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4232,7 +4363,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4248,7 +4379,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4260,7 +4391,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4268,27 +4399,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
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 ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -4298,7 +4429,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -4310,7 +4441,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -4320,7 +4451,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4331,7 +4462,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4348,24 +4479,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4373,12 +4504,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4387,24 +4518,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4413,12 +4544,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4434,13 +4565,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -4451,12 +4582,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4467,87 +4598,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4557,36 +4699,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4597,7 +4739,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4611,7 +4753,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4619,7 +4761,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4631,7 +4773,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4641,7 +4783,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4649,12 +4791,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4664,7 +4806,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4685,12 +4827,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4709,7 +4851,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4719,7 +4861,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4728,7 +4870,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4738,18 +4880,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4762,12 +4904,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4775,18 +4917,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4798,19 +4940,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4827,13 +4969,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4848,7 +4990,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4858,36 +5000,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4896,7 +5038,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -4905,19 +5047,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4929,7 +5071,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4942,7 +5084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4952,7 +5094,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -4960,7 +5102,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4971,7 +5113,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4984,12 +5126,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4997,12 +5139,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5013,50 +5155,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
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:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
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:507
+#: apt.conf.5.xml:525
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 "
@@ -5064,17 +5206,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -5083,12 +5225,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -5098,7 +5240,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5108,36 +5250,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
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:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5152,7 +5294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5162,7 +5304,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -5176,12 +5318,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -5193,12 +5335,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5214,12 +5356,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5230,12 +5372,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5245,12 +5387,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5262,12 +5404,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5279,7 +5421,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5293,12 +5435,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5307,12 +5449,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5323,7 +5465,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5331,7 +5473,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5339,7 +5481,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5349,111 +5491,111 @@ 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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -5461,93 +5603,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
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><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
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><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
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><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5557,12 +5699,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5579,91 +5721,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
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><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
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><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
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><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
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><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -5671,32 +5813,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5748,25 +5890,36 @@ msgid ""
"choice of instance, only the choice of version."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5782,40 +5935,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -5823,7 +5976,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5831,14 +5984,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5848,19 +6001,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -5868,7 +6021,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5878,7 +6031,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5887,7 +6040,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5899,12 +6052,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5913,7 +6066,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -5923,7 +6076,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5932,7 +6085,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5942,7 +6095,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5950,7 +6103,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -5959,7 +6112,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -5969,7 +6122,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5977,7 +6130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -5986,7 +6139,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -5994,7 +6147,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -6003,7 +6156,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6011,7 +6164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -6020,82 +6173,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6103,7 +6256,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6112,14 +6265,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6136,12 +6289,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -6151,7 +6304,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6159,7 +6312,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -6168,12 +6321,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6181,27 +6334,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6214,12 +6367,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6230,18 +6383,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -6251,13 +6404,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6267,7 +6420,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6276,12 +6429,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6292,18 +6445,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6312,18 +6465,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6332,13 +6485,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6351,7 +6504,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6366,12 +6519,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6379,7 +6532,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -6388,12 +6541,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6408,7 +6561,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6418,8 +6571,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6428,7 +6581,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6437,13 +6590,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6452,12 +6605,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -6474,7 +6627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6485,7 +6638,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -6494,13 +6647,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6512,12 +6665,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6537,7 +6690,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6552,7 +6705,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6561,13 +6714,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6579,12 +6732,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6813,7 +6966,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6821,9 +6974,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -7052,7 +7205,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7200,8 +7353,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"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 "
@@ -7289,7 +7442,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -7793,7 +7946,7 @@ msgstr ""
#, fuzzy
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -7951,8 +8104,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
"Pierwsz± rzecz±, jak± nale¿y zrobiæ na oddalonym komputerze z Debianem to "
"zamontowaæ dysk i przekopiowaæ na niego plik <em>/var/lib/dpkg/status</em>. "
@@ -7981,9 +8134,9 @@ msgstr ""
#: offline.sgml:149
#, fuzzy
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
"Polecenie dist-upgrade mo¿na zast±piæ ka¿dym innym podstawowym poleceniem "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ea410fc4d..e6225eb67 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\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"
@@ -782,7 +782,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -792,6 +792,66 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+#, fuzzy
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"Tradução\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap, fuzzy
+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"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" Esta página de manual foi traduzida para o Português do Brasil por\n"
+" André Luís Lopes <email>andrelop@ig.com.br</email>.\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, 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"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -854,7 +914,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
#, fuzzy
@@ -1249,7 +1309,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1443,14 +1503,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1461,9 +1521,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1476,7 +1536,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1576,7 +1636,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr ""
@@ -1777,7 +1837,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -2315,7 +2375,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2427,20 +2487,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2735,12 +2797,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -2749,27 +2830,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2839,7 +2920,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr ""
@@ -3164,15 +3245,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3427,7 +3508,7 @@ msgstr ""
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3643,13 +3724,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3657,17 +3739,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3675,119 +3757,139 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
#, fuzzy
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt.conf</>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr ""
+"<programlisting>\n"
+"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
#, fuzzy
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt.conf</>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
#, fuzzy
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -4238,7 +4340,7 @@ msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4260,18 +4362,54 @@ msgstr ""
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4281,7 +4419,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4297,7 +4435,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4309,7 +4447,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4317,27 +4455,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
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 ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -4347,7 +4485,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -4359,7 +4497,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -4369,7 +4507,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4380,7 +4518,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4397,24 +4535,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4422,12 +4560,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4436,24 +4574,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4462,12 +4600,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4483,13 +4621,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -4500,12 +4638,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4516,87 +4654,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4606,36 +4755,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4646,7 +4795,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4660,7 +4809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4668,7 +4817,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4680,7 +4829,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4690,7 +4839,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4698,12 +4847,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4713,7 +4862,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4734,12 +4883,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4758,7 +4907,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4768,7 +4917,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4777,7 +4926,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4787,18 +4936,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4811,12 +4960,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4824,18 +4973,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4847,19 +4996,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4876,13 +5025,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4897,7 +5046,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4907,36 +5056,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4945,7 +5094,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -4954,19 +5103,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4978,7 +5127,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4991,7 +5140,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5001,7 +5150,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
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 "
@@ -5009,7 +5158,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5020,7 +5169,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5033,12 +5182,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5046,12 +5195,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5062,50 +5211,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
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:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
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:507
+#: apt.conf.5.xml:525
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 "
@@ -5113,17 +5262,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
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 "
@@ -5132,12 +5281,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
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 "
@@ -5147,7 +5296,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5157,36 +5306,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
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:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5201,7 +5350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5211,7 +5360,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
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 "
@@ -5225,12 +5374,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
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 "
@@ -5242,12 +5391,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5263,12 +5412,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5279,12 +5428,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5294,12 +5443,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5311,12 +5460,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5328,7 +5477,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5342,12 +5491,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5356,12 +5505,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5372,7 +5521,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5380,7 +5529,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5388,7 +5537,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5398,120 +5547,120 @@ 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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
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 "
@@ -5519,99 +5668,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
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><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
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><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
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><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
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><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5621,12 +5770,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5643,96 +5792,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
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><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
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><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
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><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
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><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
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 "
@@ -5740,33 +5889,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5841,14 +5990,25 @@ msgstr ""
"antes no arquivo &sources-list; . O arquivo de preferências do APT não afeta "
"a escolha da instância."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "Atribuições de Prioridade Padrão do APT"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -5856,7 +6016,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -5864,7 +6024,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -5889,25 +6049,25 @@ msgstr ""
"etc/apt/apt.conf</filename>. Por exemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
#, fuzzy
msgid "priority 100"
msgstr "prioridade 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "para a instância que já esteja instalada (caso exista)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
#, fuzzy
msgid "priority 500"
msgstr "prioridade 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -5916,13 +6076,13 @@ msgstr ""
"para as instâncias que não estã instaladas e que não pertencem a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
#, fuzzy
msgid "priority 990"
msgstr "prioridade 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -5930,7 +6090,7 @@ msgstr ""
"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -5942,7 +6102,7 @@ msgstr ""
"Atribuirá :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -5954,7 +6114,7 @@ msgstr ""
"prioridade 500 para todas as instâncias de pacotes não instaladas."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -5964,7 +6124,7 @@ msgstr ""
"determinar qual instância de um pacote instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -5981,13 +6141,13 @@ msgstr ""
"\"downgrade\" pode ser arriscado.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instala a instância de prioridade mais alta."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -5997,7 +6157,7 @@ msgstr ""
"mais recente (ou seja, aquela com o maior número de versão)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -6009,7 +6169,7 @@ msgstr ""
"<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -6026,7 +6186,7 @@ msgstr ""
"forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -6041,7 +6201,7 @@ msgstr ""
"upgrade</command> forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -6061,13 +6221,13 @@ msgstr ""
"disponíveis possuir uma prioridade maior do que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "O Efeito das Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -6081,7 +6241,7 @@ msgstr ""
"das duas formas, uma forma específica e uma forma geral."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -6097,7 +6257,7 @@ msgstr ""
"com \"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6110,7 +6270,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -6126,7 +6286,7 @@ msgstr ""
"identificado pelo nome de domínio totalmente qualificado do site Internet."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -6139,7 +6299,7 @@ msgstr ""
"no site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6152,7 +6312,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -6169,7 +6329,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -6181,7 +6341,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6194,7 +6354,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6206,7 +6366,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6219,7 +6379,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6232,7 +6392,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6245,19 +6405,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6267,13 +6427,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
#, fuzzy
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6283,13 +6443,13 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
#, fuzzy
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6299,13 +6459,13 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
#, fuzzy
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6316,13 +6476,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
#, fuzzy
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt;= P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6332,19 +6492,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6356,7 +6516,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6372,7 +6532,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6382,7 +6542,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6411,12 +6571,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6432,7 +6592,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6444,7 +6604,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6459,13 +6619,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6477,31 +6637,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
#, fuzzy
msgid "gives the package name"
msgstr "informa o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
#, fuzzy
msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6523,13 +6683,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6547,7 +6707,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6555,13 +6715,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6578,13 +6738,13 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6601,7 +6761,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6614,13 +6774,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6639,7 +6799,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6647,13 +6807,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6667,7 +6827,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6675,13 +6835,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6694,7 +6854,7 @@ msgstr ""
"arquivo de preferências do APT iria requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6702,7 +6862,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6725,7 +6885,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6751,13 +6911,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais em um Registro de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6769,7 +6929,7 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -6783,13 +6943,13 @@ msgstr ""
"release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6814,7 +6974,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -6830,8 +6990,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6844,7 +7004,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -6857,7 +7017,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -6865,7 +7025,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -6878,13 +7038,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6913,7 +7073,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -6930,7 +7090,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -6943,7 +7103,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -6951,7 +7111,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -6971,12 +7131,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7006,7 +7166,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7021,7 +7181,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7034,7 +7194,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7042,7 +7202,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7062,13 +7222,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7299,7 +7459,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -7307,9 +7467,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -7526,7 +7686,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7674,8 +7834,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"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 "
@@ -7763,7 +7923,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -8241,7 +8401,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -8339,8 +8499,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
#. type: <example></example>
@@ -8357,9 +8517,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
@@ -8492,6 +8652,10 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt.conf</>"
+
+#, fuzzy
#~ msgid "/usr/share/doc/apt/"
#~ msgstr "/usr/share/doc/apt/"
diff --git a/doc/po4a.conf b/doc/po4a.conf
index fae80d690..25c314640 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -7,32 +7,19 @@
# define source file and translated file (one file per line)
[type: man] apt.8 $lang:$lang/apt.$lang.8
[type: entity] apt.ent $lang:$lang/apt.ent
-[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
- add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add
+[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add
+[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add
[type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml
# add_$lang::$lang/addendum/debiandoc_$lang.add
diff --git a/doc/pt_BR/addendum/xml_pt_BR.add b/doc/pt_BR/addendum/xml_pt_BR.add
deleted file mode 100644
index 08f94ce20..000000000
--- a/doc/pt_BR/addendum/xml_pt_BR.add
+++ /dev/null
@@ -1,5 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Tradução</title>
- Esta página de manual foi traduzida para o Português do Brasil por
- André Luís Lopes <email>andrelop@ig.com.br</email>.
- </refsect1>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 0f788aca1..c71ae6bdd 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -175,12 +175,12 @@ deb http://http.us.debian.org/debian dists/stable-updates/
commands to perform the file transfers from the remote.</para></listitem>
</varlistentry>
- <varlistentry><term>more recongnizable URI types</term>
+ <varlistentry><term>more recognizable URI types</term>
<listitem><para>
APT can be extended with more methods shipped in other optional packages which should
follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
- The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which
- provides access methods for https-URIs with features similiar to the http method, but other
+ The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which
+ provides access methods for https-URIs with features similar to the http method, but other
methods for using e.g. debtorrent are also available, see <citerefentry>
<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
<manvolnum>1</manvolnum></citerefentry>.
diff --git a/doc/xml.add b/doc/xml.add
new file mode 100644
index 000000000..9311c052f
--- /dev/null
+++ b/doc/xml.add
@@ -0,0 +1,5 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>&translation-title;</title>
+ <para>&translation-holder;</para>
+ <para>&translation-english;</para>
+ </refsect1>
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 5547c6aa5..18a3de0c2 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -58,10 +58,6 @@ FTWScanner::FTWScanner()
{
ErrorPrinted = false;
NoLinkAct = !_config->FindB("APT::FTPArchive::DeLinkAct",true);
- RealPath = 0;
- long PMax = pathconf(".",_PC_PATH_MAX);
- if (PMax > 0)
- RealPath = new char[PMax];
}
/*}}}*/
// FTWScanner::Scanner - FTW Scanner /*{{{*/
@@ -92,6 +88,8 @@ int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag)
int FTWScanner::ScannerFile(const char *File, bool const &ReadLink)
{
const char *LastComponent = strrchr(File, '/');
+ char *RealPath = NULL;
+
if (LastComponent == NULL)
LastComponent = File;
else
@@ -111,10 +109,13 @@ int FTWScanner::ScannerFile(const char *File, bool const &ReadLink)
given are not links themselves. */
char Jnk[2];
Owner->OriginalPath = File;
- if (ReadLink && Owner->RealPath != 0 &&
+ if (ReadLink &&
readlink(File,Jnk,sizeof(Jnk)) != -1 &&
- realpath(File,Owner->RealPath) != 0)
- Owner->DoPackage(Owner->RealPath);
+ (RealPath = realpath(File,NULL)) != 0)
+ {
+ Owner->DoPackage(RealPath);
+ free(RealPath);
+ }
else
Owner->DoPackage(File);
@@ -150,13 +151,15 @@ int FTWScanner::ScannerFile(const char *File, bool const &ReadLink)
/* */
bool FTWScanner::RecursiveScan(string const &Dir)
{
+ char *RealPath = NULL;
/* If noprefix is set then jam the scan root in, so we don't generate
link followed paths out of control */
if (InternalPrefix.empty() == true)
{
- if (realpath(Dir.c_str(),RealPath) == 0)
+ if ((RealPath = realpath(Dir.c_str(),NULL)) == 0)
return _error->Errno("realpath",_("Failed to resolve %s"),Dir.c_str());
- InternalPrefix = RealPath;
+ InternalPrefix = RealPath;
+ free(RealPath);
}
// Do recursive directory searching
@@ -180,13 +183,15 @@ bool FTWScanner::RecursiveScan(string const &Dir)
of files from another file. */
bool FTWScanner::LoadFileList(string const &Dir, string const &File)
{
+ char *RealPath = NULL;
/* If noprefix is set then jam the scan root in, so we don't generate
link followed paths out of control */
if (InternalPrefix.empty() == true)
{
- if (realpath(Dir.c_str(),RealPath) == 0)
+ if ((RealPath = realpath(Dir.c_str(),NULL)) == 0)
return _error->Errno("realpath",_("Failed to resolve %s"),Dir.c_str());
InternalPrefix = RealPath;
+ free(RealPath);
}
Owner = this;
@@ -555,7 +560,12 @@ bool SourcesWriter::DoPackage(string FileName)
char *BlkEnd = Buffer + St.st_size;
MD5Summation MD5;
MD5.Add((unsigned char *)Start,BlkEnd - Start);
-
+
+ SHA1Summation SHA1;
+ SHA256Summation SHA256;
+ SHA1.Add((unsigned char *)Start,BlkEnd - Start);
+ SHA256.Add((unsigned char *)Start,BlkEnd - Start);
+
// Add an extra \n to the end, just in case
*BlkEnd++ = '\n';
@@ -646,12 +656,25 @@ bool SourcesWriter::DoPackage(string FileName)
}
// Add the dsc to the files hash list
+ string const strippedName = flNotDir(FileName);
char Files[1000];
snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s",
string(MD5.Result()).c_str(),St.st_size,
- flNotDir(FileName).c_str(),
+ strippedName.c_str(),
Tags.FindS("Files").c_str());
-
+
+ char ChecksumsSha1[1000];
+ snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s",
+ string(SHA1.Result()).c_str(),St.st_size,
+ strippedName.c_str(),
+ Tags.FindS("Checksums-Sha1").c_str());
+
+ char ChecksumsSha256[1000];
+ snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s",
+ string(SHA256.Result()).c_str(),St.st_size,
+ strippedName.c_str(),
+ Tags.FindS("Checksums-Sha256").c_str());
+
// Strip the DirStrip prefix from the FileName and add the PathPrefix
string NewFileName;
if (DirStrip.empty() == false &&
@@ -669,6 +692,7 @@ bool SourcesWriter::DoPackage(string FileName)
// Perform the delinking operation over all of the files
string ParseJnk;
const char *C = Files;
+ char *RealPath = NULL;
for (;isspace(*C); C++);
while (*C != 0)
{
@@ -680,10 +704,11 @@ bool SourcesWriter::DoPackage(string FileName)
char Jnk[2];
string OriginalPath = Directory + ParseJnk;
- if (RealPath != 0 && readlink(OriginalPath.c_str(),Jnk,sizeof(Jnk)) != -1 &&
- realpath(OriginalPath.c_str(),RealPath) != 0)
+ if (readlink(OriginalPath.c_str(),Jnk,sizeof(Jnk)) != -1 &&
+ (RealPath = realpath(OriginalPath.c_str(),NULL)) != 0)
{
string RP = RealPath;
+ free(RealPath);
if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St.st_size) == false)
return false;
}
@@ -694,12 +719,14 @@ bool SourcesWriter::DoPackage(string FileName)
Directory.erase(Directory.end()-1);
// This lists all the changes to the fields we are going to make.
- // (5 hardcoded + maintainer + end marker)
- TFRewriteData Changes[5+1+SOverItem->FieldOverride.size()+1];
+ // (5 hardcoded + checksums + maintainer + end marker)
+ TFRewriteData Changes[5+2+1+SOverItem->FieldOverride.size()+1];
unsigned int End = 0;
SetTFRewriteData(Changes[End++],"Source",Package.c_str(),"Package");
SetTFRewriteData(Changes[End++],"Files",Files);
+ SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1);
+ SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256);
if (Directory != "./")
SetTFRewriteData(Changes[End++],"Directory",Directory.c_str());
SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str());
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index ad58dee0a..520e91dd6 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -35,7 +35,6 @@ class FTWScanner
protected:
vector<string> Patterns;
const char *OriginalPath;
- char *RealPath;
bool ErrorPrinted;
// Stuff for the delinker
@@ -70,7 +69,6 @@ class FTWScanner
bool SetExts(string const &Vals);
FTWScanner();
- virtual ~FTWScanner() {delete [] RealPath;};
};
class PackagesWriter : public FTWScanner
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 9802eb46c..6d694e7c9 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -37,8 +37,8 @@ class CDROMMethod : public pkgAcqMethod
bool MountedByApt;
pkgUdevCdromDevices UdevCdroms;
- bool IsCorrectCD(URI want, string MountPath);
- bool AutoDetectAndMount(URI);
+ bool IsCorrectCD(URI want, string MountPath, string& NewID);
+ bool AutoDetectAndMount(const URI, string &NewID);
virtual bool Fetch(FetchItem *Itm);
string GetID(string Name);
virtual void Exit();
@@ -92,7 +92,7 @@ string CDROMMethod::GetID(string Name)
// CDROMMethod::AutoDetectAndMount /*{{{*/
// ---------------------------------------------------------------------
/* Modifies class varaiable CDROM to the mountpoint */
-bool CDROMMethod::AutoDetectAndMount(URI Get)
+bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)
{
vector<struct CdromDevice> v = UdevCdroms.Scan();
@@ -103,7 +103,7 @@ bool CDROMMethod::AutoDetectAndMount(URI Get)
{
if (Debug)
clog << "Checking mounted cdrom device " << v[i].DeviceName << endl;
- if (IsCorrectCD(Get, v[i].MountPath))
+ if (IsCorrectCD(Get, v[i].MountPath, NewID))
{
CDROM = v[i].MountPath;
return true;
@@ -116,23 +116,24 @@ bool CDROMMethod::AutoDetectAndMount(URI Get)
return false;
// check if we have the mount point
- if (!FileExists("/media/apt"))
- mkdir("/media/apt", 0755);
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint.c_str(), 0750);
// now try mounting
for (unsigned int i=0; i < v.size(); i++)
{
if (!v[i].Mounted)
{
- if(MountCdrom("/media/apt", v[i].DeviceName))
+ if(MountCdrom(AptMountPoint, v[i].DeviceName))
{
- if (IsCorrectCD(Get, "/media/apt"))
+ if (IsCorrectCD(Get, AptMountPoint, NewID))
{
MountedByApt = true;
- CDROM = "/media/apt";
+ CDROM = AptMountPoint;
return true;
} else {
- UnmountCdrom("/media/apt");
+ UnmountCdrom(AptMountPoint);
}
}
}
@@ -144,10 +145,8 @@ bool CDROMMethod::AutoDetectAndMount(URI Get)
// CDROMMethod::IsCorrectCD /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool CDROMMethod::IsCorrectCD(URI want, string MountPath)
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath, string& NewID)
{
- string NewID;
-
for (unsigned int Version = 2; Version != 0; Version--)
{
if (IdentCdrom(MountPath,NewID,Version) == false)
@@ -220,23 +219,24 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
return true;
}
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", false);
CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
if (Debug)
clog << "Looking for CDROM at " << CDROM << endl;
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
- string NewID;
+ string NewID;
while (CurrentID.empty() == true)
{
- if (CDROM == "apt-udev-auto/")
- AutoDetectAndMount(Get);
+ if (AutoDetect)
+ AutoDetectAndMount(Get, NewID);
if(!IsMounted(CDROM))
MountedByApt = MountCdrom(CDROM);
- if (IsCorrectCD(Get, CDROM))
+ if (IsCorrectCD(Get, CDROM, NewID))
break;
// I suppose this should prompt somehow?
diff --git a/methods/ftp.cc b/methods/ftp.cc
index c91600ad5..3e1725823 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -19,6 +19,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -982,7 +983,9 @@ bool FtpMethod::Fetch(FetchItem *Itm)
FetchResult Res;
Res.Filename = Itm->DestFile;
Res.IMSHit = false;
-
+
+ maybe_add_auth (Get, _config->FindFile("Dir::Etc::netrc"));
+
// Connect to the server
if (Server == 0 || Server->Comp(Get) == false)
{
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 150c1d315..c58e6cc45 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,10 +1,9 @@
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
#include <apti18n.h>
-#include <sys/stat.h>
-#include <unistd.h>
#include <utime.h>
#include <stdio.h>
#include <fcntl.h>
@@ -45,42 +44,47 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
vector<string> &WorthlessSigners,
vector<string> &NoPubKeySigners)
{
+ bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
// setup a (empty) stringstream for formating the return value
std::stringstream ret;
ret.str("");
- if (_config->FindB("Debug::Acquire::gpgv", false))
- {
- std::cerr << "inside VerifyGetSigners" << std::endl;
- }
+ if (Debug == true)
+ std::clog << "inside VerifyGetSigners" << std::endl;
+
pid_t pid;
int fd[2];
FILE *pipein;
int status;
- struct stat buff;
- string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
- string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
- if (_config->FindB("Debug::Acquire::gpgv", false))
+ string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
+ // FIXME: remove support for deprecated APT::GPGV setting
+ string const trustedFile = _config->FindFile("Dir::Etc::Trusted",
+ _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str());
+ string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d");
+ if (Debug == true)
{
- std::cerr << "gpgv path: " << gpgvpath << std::endl;
- std::cerr << "Keyring path: " << pubringpath << std::endl;
+ std::clog << "gpgv path: " << gpgvpath << std::endl;
+ std::clog << "Keyring file: " << trustedFile << std::endl;
+ std::clog << "Keyring path: " << trustedPath << std::endl;
}
- if (stat(pubringpath.c_str(), &buff) != 0)
+ vector<string> keyrings = GetListOfFilesInDir(trustedPath, "gpg", false);
+ if (FileExists(trustedFile) == true)
+ keyrings.push_back(trustedFile);
+
+ if (keyrings.empty() == true)
{
- ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno));
+ // TRANSLATOR: %s is the trusted keyring parts directory
+ ioprintf(ret, _("No keyring installed in %s."), trustedPath.c_str());
return ret.str();
}
+
if (pipe(fd) < 0)
- {
return "Couldn't create pipe";
- }
pid = fork();
if (pid < 0)
- {
return string("Couldn't spawn new process") + strerror(errno);
- }
else if (pid == 0)
{
const char *Args[400];
@@ -90,8 +94,17 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
Args[i++] = "--status-fd";
Args[i++] = "3";
Args[i++] = "--ignore-time-conflict";
- Args[i++] = "--keyring";
- Args[i++] = pubringpath.c_str();
+ for (vector<string>::const_iterator K = keyrings.begin();
+ K != keyrings.end(); ++K)
+ {
+ Args[i++] = "--keyring";
+ Args[i++] = K->c_str();
+ // check overflow (minus a bit of extra space at the end)
+ if(i >= sizeof(Args)/sizeof(char*)-5) {
+ std::clog << _("E: Too many keyrings should be passed to gpgv. Exiting.") << std::endl;
+ exit(111);
+ }
+ }
Configuration::Item const *Opts;
Opts = _config->Tree("Acquire::gpgv::Options");
@@ -103,8 +116,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
if (Opts->Value.empty() == true)
continue;
Args[i++] = Opts->Value.c_str();
- if(i >= 395) {
- std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl;
+ // check overflow (minus a bit of extra space at the end)
+ if(i >= sizeof(Args)/sizeof(char*)-5) {
+ std::clog << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl;
exit(111);
}
}
@@ -113,14 +127,14 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
Args[i++] = outfile;
Args[i++] = NULL;
- if (_config->FindB("Debug::Acquire::gpgv", false))
+ if (Debug == true)
{
- std::cerr << "Preparing to exec: " << gpgvpath;
+ std::clog << "Preparing to exec: " << gpgvpath;
for(unsigned int j=0;Args[j] != NULL; j++)
- std::cerr << " " << Args[j];
- std::cerr << std::endl;
+ std::clog << " " << Args[j];
+ std::clog << std::endl;
}
- int nullfd = open("/dev/null", O_RDONLY);
+ 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);
@@ -159,8 +173,8 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
break;
*(buffer+bufferoff) = '\0';
bufferoff = 0;
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Read: " << buffer << std::endl;
+ if (Debug == true)
+ std::clog << "Read: " << buffer << std::endl;
// Push the data into three separate vectors, which
// we later concatenate. They're kept separate so
@@ -168,33 +182,33 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
// it will be better.
if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0)
{
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got BADSIG! " << std::endl;
+ if (Debug == true)
+ std::clog << "Got BADSIG! " << std::endl;
BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
{
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got NO_PUBKEY " << std::endl;
+ if (Debug == true)
+ std::clog << "Got NO_PUBKEY " << std::endl;
NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
{
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got NODATA! " << std::endl;
+ if (Debug == true)
+ std::clog << "Got NODATA! " << std::endl;
BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0)
{
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got KEYEXPIRED! " << std::endl;
+ if (Debug == true)
+ std::clog << "Got KEYEXPIRED! " << std::endl;
WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)
{
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got REVKEYSIG! " << std::endl;
+ if (Debug == true)
+ std::clog << "Got REVKEYSIG! " << std::endl;
WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)
@@ -204,17 +218,17 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
while (*p && isxdigit(*p))
p++;
*p = 0;
- if (_config->FindB("Debug::Acquire::gpgv", false))
- std::cerr << "Got GOODSIG, key ID:" << sig << std::endl;
+ if (Debug == true)
+ std::clog << "Got GOODSIG, key ID:" << sig << std::endl;
GoodSigners.push_back(string(sig));
}
}
fclose(pipein);
waitpid(pid, &status, 0);
- if (_config->FindB("Debug::Acquire::gpgv", false))
+ if (Debug == true)
{
- std::cerr << "gpgv exited\n";
+ std::clog << "gpgv exited\n";
}
if (WEXITSTATUS(status) == 0)
@@ -305,7 +319,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
if (_config->FindB("Debug::Acquire::gpgv", false))
{
- std::cerr << "gpgv succeeded\n";
+ std::clog << "gpgv succeeded\n";
}
return true;
diff --git a/methods/http.cc b/methods/http.cc
index 8fcff0b5d..2dae87a02 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -29,6 +29,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -42,6 +43,7 @@
#include <map>
#include <apti18n.h>
+
// Internet stuff
#include <netdb.h>
@@ -49,7 +51,6 @@
#include "connect.h"
#include "rfc2553emu.h"
#include "http.h"
-
/*}}}*/
using namespace std;
@@ -724,10 +725,12 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Proxy-Authorization: Basic ") +
Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
if (Uri.User.empty() == false || Uri.Password.empty() == false)
+ {
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
-
+ }
Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
"Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
diff --git a/methods/https.cc b/methods/https.cc
index 4daa04e32..aa6786aa8 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -14,6 +14,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -56,37 +57,40 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
return 0;
}
-void HttpsMethod::SetupProxy() { /*{{{*/
- URI ServerName = Queue->Uri;
-
- // Determine the proxy setting - try https first, fallback to http and use env at last
- string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
- _config->Find("Acquire::http::Proxy::" + ServerName.Host));
-
- if (UseProxy.empty() == true)
- UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy"));
-
- // User want to use NO proxy, so nothing to setup
- if (UseProxy == "DIRECT")
- return;
-
- if (UseProxy.empty() == false) {
- // Parse no_proxy, a comma (,) separated list of domains we don't want to use
- // a proxy for so we stop right here if it is in the list
- if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
- return;
- } else {
- const char* result = getenv("http_proxy");
- UseProxy = result == NULL ? "" : result;
- }
-
- // Determine what host and port to use based on the proxy settings
- if (UseProxy.empty() == false) {
- Proxy = UseProxy;
- if (Proxy.Port != 1)
- curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
- curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
- }
+void HttpsMethod::SetupProxy() /*{{{*/
+{
+ URI ServerName = Queue->Uri;
+
+ // Determine the proxy setting - try https first, fallback to http and use env at last
+ string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host,
+ _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str());
+
+ if (UseProxy.empty() == true)
+ UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy").c_str());
+
+ // User want to use NO proxy, so nothing to setup
+ if (UseProxy == "DIRECT")
+ return;
+
+ if (UseProxy.empty() == false)
+ {
+ // Parse no_proxy, a comma (,) separated list of domains we don't want to use
+ // a proxy for so we stop right here if it is in the list
+ if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+ return;
+ } else {
+ const char* result = getenv("http_proxy");
+ UseProxy = result == NULL ? "" : result;
+ }
+
+ // Determine what host and port to use based on the proxy settings
+ if (UseProxy.empty() == false)
+ {
+ Proxy = UseProxy;
+ if (Proxy.Port != 1)
+ curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
+ curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
+ }
} /*}}}*/
// HttpsMethod::Fetch - Fetch an item /*{{{*/
// ---------------------------------------------------------------------
@@ -110,8 +114,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_reset(curl);
SetupProxy();
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
+
// callbacks
- curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());
+ curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
@@ -119,7 +125,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
curl_easy_setopt(curl, CURLOPT_FILETIME, true);
- curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
// SSL parameters are set by default to the common (non mirror-specific) value
// if available (or a default one) and gets overload by mirror-specific ones.
@@ -128,7 +133,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
string cainfo = _config->Find("Acquire::https::CaInfo","");
string knob = "Acquire::https::"+remotehost+"::CaInfo";
cainfo = _config->Find(knob.c_str(),cainfo.c_str());
- if(cainfo != "")
+ if(cainfo.empty() == false)
curl_easy_setopt(curl, CURLOPT_CAINFO,cainfo.c_str());
// Check server certificate against previous CA list ...
@@ -146,18 +151,25 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
default_verify = 0;
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
+ // Also enforce issuer of server certificate using its cert
+ string issuercert = _config->Find("Acquire::https::IssuerCert","");
+ knob = "Acquire::https::"+remotehost+"::IssuerCert";
+ issuercert = _config->Find(knob.c_str(),issuercert.c_str());
+ if(issuercert.empty() == false)
+ curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str());
+
// For client authentication, certificate file ...
string pem = _config->Find("Acquire::https::SslCert","");
knob = "Acquire::https::"+remotehost+"::SslCert";
pem = _config->Find(knob.c_str(),pem.c_str());
- if(pem != "")
+ if(pem.empty() == false)
curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
// ... and associated key.
string key = _config->Find("Acquire::https::SslKey","");
knob = "Acquire::https::"+remotehost+"::SslKey";
key = _config->Find(knob.c_str(),key.c_str());
- if(key != "")
+ if(key.empty() == false)
curl_easy_setopt(curl, CURLOPT_SSLKEY, key.c_str());
// Allow forcing SSL version to SSLv3 or TLSv1 (SSLv2 is not
@@ -172,6 +184,13 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
final_version = CURL_SSLVERSION_SSLv3;
curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version);
+ // CRL file
+ string crlfile = _config->Find("Acquire::https::CrlFile","");
+ knob = "Acquire::https::"+remotehost+"::CrlFile";
+ crlfile = _config->Find(knob.c_str(),crlfile.c_str());
+ if(crlfile.empty() == false)
+ curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str());
+
// cache-control
if(_config->FindB("Acquire::https::No-Cache",
_config->FindB("Acquire::http::No-Cache",false)) == false)
@@ -191,7 +210,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
// speed limit
- int dlLimit = _config->FindI("Acquire::https::Dl-Limit",
+ int const dlLimit = _config->FindI("Acquire::https::Dl-Limit",
_config->FindI("Acquire::http::Dl-Limit",0))*1024;
if (dlLimit > 0)
curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
@@ -200,16 +219,18 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_USERAGENT,
_config->Find("Acquire::https::User-Agent",
_config->Find("Acquire::http::User-Agent",
- "Debian APT-CURL/1.0 ("VERSION")")).c_str());
+ "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
// set timeout
- int timeout = _config->FindI("Acquire::https::Timeout",
+ int const timeout = _config->FindI("Acquire::https::Timeout",
_config->FindI("Acquire::http::Timeout",120));
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
+ //set really low lowspeed timeout (see #497983)
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
// set redirect options and default to 10 redirects
- bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
+ bool const AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
_config->FindB("Acquire::http::AllowRedirect",true));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);
diff --git a/methods/https.h b/methods/https.h
index 2c33d95ee..3f0c416b6 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -24,6 +24,8 @@ class HttpsMethod;
class HttpsMethod : public pkgAcqMethod
{
+ // minimum speed in bytes/se that triggers download timeout handling
+ static const int DL_MIN_SPEED = 10;
virtual bool Fetch(FetchItem *);
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
diff --git a/po/apt-all.pot b/po/apt-all.pot
index b6610a191..d849c7cca 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-28 02:10+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,14 +144,9 @@ msgstr ""
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr ""
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -246,7 +241,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -342,7 +337,7 @@ msgstr ""
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -549,7 +544,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -708,11 +703,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -741,8 +736,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -776,7 +771,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -785,7 +780,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr ""
@@ -877,50 +872,50 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1321
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1352
#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -936,49 +931,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -986,152 +981,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1175,7 +1170,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2867
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1405,11 +1400,10 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1439,9 +1433,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr ""
@@ -1583,147 +1577,147 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1784,38 +1778,43 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
#, c-format
-msgid "Couldn't access keyring: '%s'"
+msgid "No keyring installed in %s."
+msgstr ""
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1831,80 +1830,80 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:788
+#: methods/http.cc:791
msgid "Select failed"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:816
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:847
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:889
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1147
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1311
+#: methods/http.cc:1314
msgid "Internal error"
msgstr ""
@@ -1960,52 +1959,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2081,75 +2080,75 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr ""
@@ -2266,64 +2265,64 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2331,7 +2330,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2402,12 +2401,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2428,17 +2427,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2522,16 +2521,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
@@ -2540,39 +2539,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1260
#, 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:1283
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr ""
@@ -2699,76 +2698,96 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr ""
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index eaa24a32f..c5fbe9077 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -149,14 +149,9 @@ msgstr ""
msgid " Version table:"
msgstr " جدول النسخ:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s لـ%s %s Ù…Ùجمّع على %s %s\n"
@@ -555,7 +550,7 @@ msgstr "Ùشل تغيير اسم %s إلى %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -716,11 +711,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة Ù…Ùعطّلة."
msgid "Internal error, Ordering didn't finish"
msgstr "خطأ داخلي، لم تنته عملية الترتيب"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "تعذر Ù‚ÙŽÙْل دليل التنزيل"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة قائمة المصادر."
@@ -749,8 +744,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضاÙيّة س
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "بعد الاستخراج %sب من المساحة ستÙرّغ.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة ÙÙŠ %s"
@@ -787,7 +782,7 @@ msgstr "إجهاض."
msgid "Do you want to continue [Y/n]? "
msgstr "هل تريد الاستمرار [Y/n]؟"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ùشل إحضار %s %s\n"
@@ -796,7 +791,7 @@ msgstr "Ùشل إحضار %s %s\n"
msgid "Some files failed to download"
msgstr "Ùشل تنزيل بعض الملÙات"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل ÙˆÙÙŠ وضع التنزيل Ùقط"
@@ -891,50 +886,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "لا يقبل الأمر update أية Ù…Ùعطيات"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "تعذر Ù‚ÙÙ„ دليل القائمة"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -950,51 +945,51 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "قد تساعد المعلومات التالية ÙÙŠ حل المشكلة:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
"Ù…Ùعتمدات غير مستوÙاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1002,152 +997,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "حزم معطوبة"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "سيتم تثبيت الحزم الإضاÙيّة التالية:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "الحزم المقترحة:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "الحزم المستحسنة:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ùشل"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "تمّ"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي المل٠'%s' المنزل مسبقاً\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ليس هناك مساحة كاÙية ÙÙŠ %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "يجب جلب %sب/%sب من الأرشيÙات المصدرية.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيÙات المصدريّة.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Ùشل إحضار بعض الأرشيÙات."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر ÙÙƒ الحزمة '%s' Ùشل.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' Ùشل.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1191,7 +1186,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1429,7 +1424,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1593,11 +1588,11 @@ msgid "File not found"
msgstr "لم ÙŠÙعثر على الملÙ"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Ùشيل تنÙيذ stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Ùشل تعيين وقت التعديل"
@@ -1606,34 +1601,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "تسجيل الدخول"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "رÙض الخادم اتصالنا بالرد: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Ùشل USERØŒ ردّ الخادم: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Ùشل PASSØŒ ردّ الخادم: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1641,114 +1636,114 @@ msgstr ""
"تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin "
"Ùارغ."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Ùشل أمر نص تسجيل الدخول البرمجي '%s'ØŒ ردّ الخادم: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Ùشل TYPEØŒ ردّ الخادم: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "انتهى وقت الاتصال"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "أغلق الخادم الاتصال"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "خطأ ÙÙŠ القراءة"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "خطأ ÙÙŠ الكتابة"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "تعذر إرسال الأمر PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Ùشل EPRTØŒ ردّ الخادم: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "تعذر قبول الاتصال"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "تعذر إحضار الملÙØŒ ردّ الخادم '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Ùشل نقل البيانات، ردّ الخادم '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "استعلام"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1856,81 +1851,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "بانتظار الترويسات"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "سطر ترويسة سيء"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "أرسل خادم http ترويسة طول محتويات (ÙContent-Length) غير صالحة"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "أرسل خادم http ترويسة مدى محتويات (ÙContent-Range) غير صالحة"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "خادم http له دعم مدى معطوب"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "نسق تاريخ مجهول"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Ùشل التحديد"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "انتهى وقت الاتصال"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "خطأ ÙÙŠ الكتابة إلى مل٠المÙخرجات"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "خطأ ÙÙŠ الكتابة إلى الملÙ"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "خطأ ÙÙŠ الكتابة إلى الملÙ"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "خطأ ÙÙŠ القراءة من الخادم. أقÙÙ„ الطر٠الآخر الاتصال"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "خطأ ÙÙŠ القراءة من الخادم"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Ùشلت كتابة المل٠%s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "بيانات ترويسة سيئة"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Ùشل الاتصال"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "خطأ داخلي"
@@ -1938,25 +1933,18 @@ msgstr "خطأ داخلي"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2343,14 +2331,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2358,7 +2346,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2429,12 +2417,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "الرجاء إدخال القرص المÙسمّى '%s' ÙÙŠ السوّاقة '%s' وضغط Ù…Ùتاح الإدخال."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "نظام الحزم '%s' غير مدعوم"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2567,40 +2555,40 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "Ùشل إعادة التسمية ØŒ %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, 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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
@@ -2730,76 +2718,98 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Ùتح مل٠التهيئة %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum غير متطابقة"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "تهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "إزالة %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "تمت إزالة %s بالكامل"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "تحضير %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Ùتح %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "التحضير لتهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "التحضير لإزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "تم إزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "التحضير لإزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2825,24 +2835,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
+#: methods/rred.cc:219
+msgid "Could not patch file"
msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/ast.po b/po/ast.po
index 287f29c55..5273037fa 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-07-01 18:09+0100\n"
"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
"com>\n"
@@ -141,14 +141,9 @@ msgstr " Chincheta de paquetes: "
msgid " Version table:"
msgstr " Tabla de versiones:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pa %s compiláu en %s %s\n"
@@ -648,7 +643,7 @@ msgstr "Nun pudo renomase %s como %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación d'espresión regular - %s"
@@ -809,11 +804,11 @@ msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
msgid "Internal error, Ordering didn't finish"
msgstr "Error internu, ordenar nun finó"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Nun pue bloquiase'l direutoriu de descarga"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nun pudo lleese la llista de fontes."
@@ -842,8 +837,8 @@ msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nun pue determinase l'espaciu llibre de %s"
@@ -880,7 +875,7 @@ msgstr "Encaboxar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quies continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
@@ -889,7 +884,7 @@ msgstr "Falló algamar %s %s\n"
msgid "Some files failed to download"
msgstr "Dellos ficheros nun pudieron descargase"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de sólo descarga"
@@ -987,34 +982,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Escoyida la versión %s (%s) pa %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "La orde update nun lleva argumentos"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Nun pudo bloquiase'l direutoriu de llista"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1022,18 +1017,18 @@ msgstr ""
"Los siguientes paquetes instalaronse de manera automática y ya nun se "
"necesiten:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Los siguientes paquetes instalaronse de manera automática y ya nun se "
"necesiten:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Usa 'apt-get autoremove' pa desinstalalos."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1051,43 +1046,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente información pue aidar a resolver la situación:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error internu, AutoRemover rompió coses"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error internu, AllUpgrade rompió coses"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Nun pudo alcontrase la tarea %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Nun pudo alcontrase'l paquete %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escoyendo %s pa la espresión regular '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s axustáu como instaláu manualmente.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Habríes d'executar `apt-get -f install' para iguar estos:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1095,7 +1090,7 @@ msgstr ""
"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
"conseña una solución)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1107,117 +1102,117 @@ msgstr ""
"inestable, que dellos paquetes necesarios nun se crearon o que\n"
"s'allugaron fuera d'Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Paquetes frañaos"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Instalaránse los siguientes paquetes extra:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Paquetes afalaos:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Paquetes encamentaos"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Calculando l'autualización... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Falló"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Fecho"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Error internu, l'iguador de problemes frañó coses"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru yá descargáu '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nun hai espaciu llibre bastante en %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Fonte descargada %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Falló la descarga de dellos archivos."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orde de desempaquetáu '%s'.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orde build '%s'.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Falló el procesu fíu"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
"construcción"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nun tien dependencies de construcción.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1221,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1230,32 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque denguna versión "
"disponible del paquete %s satisfaz los requisitos de versión"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
"demasiao nuevu"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Fallu al procesar les dependencies de construcción"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1346,7 +1341,7 @@ msgstr ""
"pa más información y opciones.\n"
" Esti APT tien Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1603,7 +1598,7 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1771,11 +1766,11 @@ msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Falló al lleer"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificación"
@@ -1784,34 +1779,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI malu, los URIS llocales nun pueden entamar por //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Entrando"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nun se pudo determinar el nome del par"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nun se pudo determinar el nome llocal"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "El sirvidor refugó la conexón, y dixo: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1819,114 +1814,114 @@ msgstr ""
"Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::"
"ProxyLogin ta baleru."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "La triba (TYPE) falló; el sirvidor dixo: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Gandió'l tiempu de conexón"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "El sirvidor zarró la conexón"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Fallu de llectura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Una rempuesta revirtió'l buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Corrupción del protocolu"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Fallu d'escritura"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nun se pudo crear un socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nun se pudo coneutar un socket pasivu."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo nun pudo obtener un zócalu oyente"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nun se pudo enllazar con un socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Nun se pudo escuchar nel socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Nun se pudo determinar el nome del socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Nun se pudo mandar la orde PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Direición de familia %u desconocida (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT falló; el sirvidor dixo: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Gandió'l tiempu de conexón col zócalu de datos"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Nun se pudo aceptar la conexón"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hebo un problema al xenerar el hash del ficheru"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Gandió'l tiempu del zócalu de datos"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nun se pudo invocar "
@@ -2038,80 +2033,80 @@ msgstr "Nun se pudo abrir una tubería pa %s"
msgid "Read error from %s process"
msgstr "Fallu de llectura dende'l procesu %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Esperando les testeres"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtúvose una sola llinia de testera penriba de %u carauteres"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Fallu na llinia testera"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formatu de data desconocíu"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Falló la escoyeta"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Gandió'l tiempu de conexón"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Fallu al escribir nel ficheru de salida"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón."
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Fallu al lleer nel sirvidor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Falló al francer el ficheru"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Datos de testera incorreutos"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Fallo la conexón"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Fallu internu"
@@ -2119,12 +2114,12 @@ msgstr "Fallu internu"
msgid "Can't mmap an empty file"
msgstr "Nun se puede facer mmap d'un ficheru baleru"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nun se pudo facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2133,13 +2128,6 @@ msgstr ""
"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2526,14 +2514,14 @@ msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Llinia %u mal formada na llista d'oríxenes %s (id del proveedor)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2544,7 +2532,7 @@ msgstr ""
"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye "
"malo, pero si daveres quies facelo, activa la opción APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2620,12 +2608,12 @@ msgstr "El métodu %s nun entamó correchamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza"
@@ -2761,19 +2749,19 @@ msgstr "Fallu de E/S al grabar caché d'oríxenes"
msgid "rename failed, %s (%s -> %s)."
msgstr "falló'l cambiu de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "La suma MD5 nun concasa"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2782,7 +2770,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2791,7 +2779,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2799,7 +2787,7 @@ msgstr ""
"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
"paquete %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "El tamañu nun concasa"
@@ -2934,78 +2922,101 @@ msgstr ""
"Escribiéronse %i rexistros con %i ficheros perdíos y %i ficheros que nun "
"concasen\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Abriendo ficheros de configuración %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "La suma hash nun concasa"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Desinstalando %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Desinstalóse dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando activador de post-instalación de %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta'l direutoriu '%s'."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparándose pa configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s instaláu"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose pa desinstalar %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s desinstaláu"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose pa desinstalar dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nun puede escribise nel rexistru, falló openpty() (¿/dev/pts nun ta "
"montáu?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3031,30 +3042,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nun fui quien a parchiar el ficheru"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexón encaboxada prematuramente"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "No source package '%s' picking '%s' instead\n"
#~ msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' ehí\n"
-#~ msgid "Could not patch file"
-#~ msgstr "Nun fui quien a parchiar el ficheru"
-
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/bg.po b/po/bg.po
index f2e499e5e..840007734 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-01-27 12:41+0200\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -149,14 +149,9 @@ msgstr " Отбиване на пакета: "
msgid " Version table:"
msgstr " Таблица Ñ Ð²ÐµÑ€Ñиите:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s за %s компилиран на %s %s\n"
@@ -661,7 +656,7 @@ msgstr "ÐеуÑпех при преименуването на %s на %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулÑÑ€Ð½Ð¸Ñ Ð¸Ð·Ñ€Ð°Ð· - %s"
@@ -824,11 +819,11 @@ msgstr "ТрÑбва да бъдат премахнати пакети, но пÑ
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "ÐеуÑпех при заключването на директориÑта за изтеглÑне"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "СпиÑъкът Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ не можа да бъде прочетен."
@@ -860,8 +855,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "След тази Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ‰Ðµ бъде оÑвободено %sB диÑково проÑтранÑтво.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ÐеуÑпех при определÑнето на Ñвободното проÑтранÑтво в %s"
@@ -898,7 +893,7 @@ msgstr "ПрекъÑване."
msgid "Do you want to continue [Y/n]? "
msgstr "ИÑкате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ÐеуÑпех при изтеглÑнето на %s %s\n"
@@ -907,7 +902,7 @@ msgstr "ÐеуÑпех при изтеглÑнето на %s %s\n"
msgid "Some files failed to download"
msgstr "ÐÑкои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "ИзтеглÑнето завърши в режим Ñамо на изтеглÑне"
@@ -1005,52 +1000,52 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Избрана е верÑÐ¸Ñ %s (%s) за %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
"ÐеуÑпех при получаването на атрибути на ÑпиÑъка Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸ Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Командата „update“ не възприема аргументи"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "ÐеуÑпех при заключването на директориÑта ÑÑŠÑ ÑпиÑъка на пакетите"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Ðе би Ñ‚Ñ€Ñбвало да Ñе изтрива. AutoRemover нÑма да бъде Ñтартиран"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Следните пакети Ñа били инÑталирани автоматично и вече не Ñа необходими:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Следните пакети Ñа били инÑталирани автоматично и вече не Ñа необходими:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1068,44 +1063,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
"Следната Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶Ðµ да помогне за намиране на изход от ÑитуациÑта:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Вътрешна грешка, AutoRemover Ñчупи нещо в ÑиÑтемата"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ Ñчупи нещо в ÑиÑтемата"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "ÐеуÑпех при намирането на задача %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "ÐеуÑпех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Забележете, избиране на %s за регулÑрен израз „%s“\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s е отбелÑзан като ръчно инÑталиран.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1113,7 +1108,7 @@ msgstr ""
"Ðеудовлетворени завиÑимоÑти. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1125,118 +1120,118 @@ msgstr ""
"диÑтрибуциÑ, че нÑкои необходими пакети още не Ñа Ñъздадени или пък\n"
"Ñа били премеÑтени от Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Счупени пакети"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инÑталирани:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "ИзчиÑлÑване на актуализациÑта..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "ÐеуÑпех"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ Ñчупи нещо в ÑиÑтемата"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "ТрÑбва да укажете поне един пакет за изтеглÑне на Ð¸Ð·Ñ…Ð¾Ð´Ð½Ð¸Ñ Ð¼Ñƒ код"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ÐеуÑпех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ПропуÑкане на вече Ð¸Ð·Ñ‚ÐµÐ³Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ÐÑмате доÑтатъчно Ñвободно проÑтранÑтво в %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ðеобходимо е да Ñе изтеглÑÑ‚ %sB/%sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ðеобходимо е да Ñе изтеглÑÑ‚ %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "ИзтеглÑне на изходен код %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "ÐеуÑпех при изтеглÑнето на нÑкои архиви."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"ПропуÑкане на разпакетирането на вече Ñ€Ð°Ð·Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код в %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инÑталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "ПроцеÑÑŠÑ‚-потомък пропадна"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ТрÑбва да укажете поне един пакет за проверка на завиÑимоÑти за компилиране"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"ÐеуÑпех при получаването на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° завиÑимоÑтите за компилиране на %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s нÑма завиÑимоÑти за компилиране.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1245,7 +1240,7 @@ msgstr ""
"ЗавиÑимоÑÑ‚ %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1255,32 +1250,32 @@ msgstr ""
"налични верÑии на пакета %s, които могат да удовлетворÑÑ‚ изиÑкването за "
"верÑиÑ"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"ÐеуÑпех при удовлетворÑването на завиÑимоÑÑ‚ %s за пакета %s: ИнÑталираниÑÑ‚ "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ÐеуÑпех при удовлетворÑването на завиÑимоÑÑ‚ %s за пакета %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ЗавиÑимоÑтите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "ÐеуÑпех при обработката на завиÑимоÑтите за компилиране"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1367,7 +1362,7 @@ msgstr ""
"Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ опции.\n"
" Това APT има Върховни Сили.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1617,7 +1612,7 @@ msgstr "Файл %s/%s Ð·Ð°Ð¼ÐµÐ½Ñ Ñ‚Ð¾Ð·Ð¸ в пакет %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1785,11 +1780,11 @@ msgid "File not found"
msgstr "Файлът не е намерен"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "ÐеуÑпех при получаването на атрибути"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "ÐеуÑпех при задаването на време на промÑна"
@@ -1798,34 +1793,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ðевалиден адреÑ-URI, локалните адреÑи-URI не Ñ‚Ñ€Ñбва да започват Ñ â€ž//“"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Влизане"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "ÐеуÑпех при уÑтановÑването на името на Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ñървър"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "ÐеуÑпех при уÑтановÑването на локалното име"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Сървърът отказа Ñвързване и Ñъобщи: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER Ñе провали, Ñървърът Ñъобщи: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS Ñе провали, Ñървърът Ñъобщи: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1833,116 +1828,116 @@ msgstr ""
"Беше указан Ñървър-поÑредник, но нÑма Ñкрипт за влизане, Acquire::ftp::"
"ProxyLogin е празен."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Командата „%s“ на Ñкрипта за влизане Ñе провали, Ñървърът Ñъобщи: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE Ñе провали, Ñървърът Ñъобщи: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "ДопуÑтимото време за Ñвързването изтече"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Сървърът разпадна връзката"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Грешка при четене"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Отговорът препълни буфера."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Развален протокол"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Грешка при запиÑ"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "ÐеуÑпех при Ñъздаването на гнездо"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
"ÐеуÑпех при Ñвързването на гнездо за данни, допуÑтимото време за Ñвъзрзване "
"изтече"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "ÐеуÑпех при Ñвързването на паÑивно гнездо."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo не уÑÐ¿Ñ Ð´Ð° Ñе добере до Ñлушащо гнездо"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "ÐеуÑпех при Ñвързването на гнездо"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "ÐеуÑпех при Ñлушането на гнездото"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "ÐеуÑпех при определÑнето на името на гнездото"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "ÐеуÑпех при изпращането на командата PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "ÐеизвеÑтно ÑемейÑтво адреÑи %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT Ñе провали, Ñървърът Ñъобщи: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Времето за уÑтановÑване на връзка Ñ Ð³Ð½ÐµÐ·Ð´Ð¾ за данни изтече"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Ðевъзможно е да Ñе приеме Ñвързването"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "ÐеуÑпех при изтеглÑнето на файла, Ñървърът Ñъобщи „%s“"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Времето за връзка Ñ Ð³Ð½ÐµÐ·Ð´Ð¾ за данни изтече"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "ÐеуÑпех при прехвърлÑнето на данни, Ñървърът Ñъобщи: „%s“"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Запитване"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "ÐеуÑпех при извикването на "
@@ -2058,80 +2053,80 @@ msgstr "ÐеуÑпех при отварÑнето на програмен каÐ
msgid "Read error from %s process"
msgstr "Грешка при четене от Ð¿Ñ€Ð¾Ñ†ÐµÑ %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Чакане на заглавни чаÑти"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен е един ред на заглавна чаÑÑ‚ Ñ Ð½Ð°Ð´ %u Ñимвола"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ðевалиден ред на заглавна чаÑÑ‚"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP Ñървърът изпрати невалидна заглавна чаÑÑ‚ като отговор"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP Ñървърът изпрати невалидна заглавна чаÑÑ‚ „Content-Length“"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP Ñървърът изпрати невалидна заглавна чаÑÑ‚ „Content-Range“"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "HTTP Ñървърът нÑма поддръжка за прехвърлÑне на фрагменти на файлове"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "ÐеизвеÑтен формат на дата"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "ÐеуÑпех на избора"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "ДопуÑтимото време за Ñвързване изтече"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Грешка при запиÑа на изходен файл"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Грешка при запиÑа на файл"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Грешка при запиÑа на файла"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от Ñървъра. ОтдалечениÑÑ‚ Ñървър прекъÑна връзката"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Грешка при четене от Ñървъра"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "ÐеуÑпех при отрÑзване на ÐºÑ€Ð°Ñ Ð½Ð° файла"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Ðевалидни данни на заглавната чаÑÑ‚"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "ÐеуÑпех при Ñвързването"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Вътрешна грешка"
@@ -2139,25 +2134,18 @@ msgstr "Вътрешна грешка"
msgid "Can't mmap an empty file"
msgstr "Ðевъзможно е да Ñе прехвърли в паметта празен файл"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "ÐеуÑпех при прехвърлÑнето в паметта на %lu байта"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2552,14 +2540,14 @@ msgstr ""
"Лошо форматиран ред %u в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ %s (идентификатор на "
"производител)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2571,7 +2559,7 @@ msgstr ""
"пакет %s. Това чеÑто е лошо, но ако наиÑтина иÑкате да го направите, "
"активирайте опциÑта APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2649,12 +2637,12 @@ msgstr "Методът %s не Ñтартира правилно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Сложете диÑка, озаглавен „%s“ в уÑтройÑтво „%s“ и натиÑнете „Enter“."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Пакетната ÑиÑтема „%s“ не е поддържана"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "ÐеуÑпех при определÑнето на подходÑща пакетна ÑиÑтема"
@@ -2795,19 +2783,19 @@ msgstr "Входно/изходна грешка при запазването Ð
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването Ñе провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "ÐеÑъответÑтвие на контролна Ñума MD5"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "ÐеÑъответÑтвие на контролната Ñума"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "ÐÑма налични публични ключове за Ñледните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2816,7 +2804,7 @@ msgstr ""
"ÐеуÑпех при намирането на файл за пакет %s. Това може да означава, че Ñ‚Ñ€Ñбва "
"ръчно да оправите този пакет (поради пропуÑната архитектура)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2825,14 +2813,14 @@ msgstr ""
"ÐеуÑпех при намирането на файл за пакет %s. Това може да означава, че Ñ‚Ñ€Ñбва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ИндекÑните файлове на пакета Ñа повредени. ÐÑма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "ÐеÑъответÑтвие на размера"
@@ -2965,78 +2953,101 @@ msgstr "ЗапиÑани Ñа %i запиÑа Ñ %i неÑъответÑтващ
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "ЗапиÑани Ñа %i запиÑа Ñ %i липÑващи и %i неÑъответÑтващи файла\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "ОтварÑне на конфигурационен файл %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "ÐеÑъответÑтвие на контролната Ñума"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "ИнÑталиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Конфигуриране на %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Премахване на %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s е напълно премахнат"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Изпълнение на тригер Ñлед инÑталиране %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "ДиректориÑта „%s“ липÑва"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "ПодготвÑне на %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Разпакетиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "ПодготвÑне на %s за конфигуриране"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s е инÑталиран"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "ПодготвÑне за премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s е премахнат"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка за пълно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð² журнала, openpty() Ñе провали (дали /dev/pts е "
"монтирана?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3062,26 +3073,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "ÐеуÑпех при закърпване на файла"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Връзката прекъÑна преждевременно"
-#~ msgid "Could not patch file"
-#~ msgstr "ÐеуÑпех при закърпване на файла"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/bs.po b/po/bs.po
index e1a09c513..cab5ac4c7 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -145,14 +145,9 @@ msgstr ""
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr ""
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -563,7 +558,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -724,11 +719,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -757,8 +752,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -793,7 +788,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -802,7 +797,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr ""
@@ -895,50 +890,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -954,49 +949,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1004,152 +999,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "PreporuÄeni paketi:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "RaÄunam nadogradnju..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1193,7 +1188,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1426,7 +1421,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1590,11 +1585,11 @@ msgid "File not found"
msgstr "Datoteka nije pronađena"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr ""
@@ -1603,148 +1598,148 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Prijavljujem se"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Server je zatvorio vezu"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "GreÅ¡ka pri Äitanju"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
#, fuzzy
msgid "Protocol corruption"
msgstr "Oštećenje protokola"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Greška pri pisanju"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1853,81 +1848,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "ÄŒekam na zaglavlja"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Ne mogu ukloniti %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1935,25 +1930,18 @@ msgstr "Unutrašnja greška"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2341,14 +2329,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2356,7 +2344,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2427,12 +2415,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2565,39 +2553,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, 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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr ""
@@ -2727,76 +2715,96 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr ""
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se sa %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Otvaram %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, fuzzy, c-format
msgid "Removed %s"
msgstr "PreporuÄuje"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2822,18 +2830,8 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
+#: methods/rred.cc:219
+msgid "Could not patch file"
msgstr ""
#: methods/rsh.cc:330
diff --git a/po/ca.po b/po/ca.po
index eb15b637e..eb1a48a12 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-06-06 02:17+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -146,14 +146,9 @@ msgstr " Etiqueta del paquet: "
msgid " Version table:"
msgstr " Taula de versió:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per a %s compilat el %s %s\n"
@@ -651,7 +646,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -815,11 +810,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
@@ -850,8 +845,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -888,7 +883,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -897,7 +892,7 @@ msgstr "No s'ha pogut obtenir %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut baixar"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
@@ -996,53 +991,53 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
"automàtic"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Empreu «apt-get autoremove» per a suprimir-los."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1060,43 +1055,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "No s'ha pogut trobar la tasca %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "S'ha marcat %s com instal·lat manualment.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1099,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1116,120 +1111,120 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita baixar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Obté el font %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1238,7 +1233,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1247,32 +1242,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1358,7 +1353,7 @@ msgstr ""
"per a obtenir més informació i opcions.\n"
" Aquest APT té superpoders bovins\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1611,7 +1606,7 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1780,11 +1775,11 @@ msgid "File not found"
msgstr "Fitxer no trobat"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -1793,34 +1788,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI no vàlid, els URI locals no han de començar per //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "S'està accedint a"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "No es pot determinar el nom de la màquina distant"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "No es pot determinar el nom local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER ha fallat, el servidor ha dit: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS ha fallat, el servidor ha dit: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1828,115 +1823,115 @@ msgstr ""
"S'ha especificat un servidor intermediari però no un script d'accés, "
"Acquire::ftp::ProxyLogin està buit."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "L'ordre '%s' de l'script d'accés ha fallat, el servidor ha dit: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE ha fallat, el servidor ha dit: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Temps de connexió finalitzat"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "El servidor ha tancat la connexió"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Error de lectura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Una resposta ha desbordat la memòria temporal."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protocol corromput"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Error d'escriptura"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "No s'ha pogut crear un sòcol"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "No s'ha pogut connectar amb el sòcol passiu."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte"
# abastar? huh? jm
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "No s'ha pogut abastar un connector"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "No s'ha pogut escoltar sobre el sòcol"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "No s'ha pogut determinar el nom del sòcol"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "No es pot enviar l'ordre PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "La família d'adreces %u és desconeguda (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT ha fallat, el servidor ha dit: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "No és possible reprendre el fitxer, el servidor ha dit '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "S'ha esgotat el temps d'espera per al sòcol de dades"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "No es pot invocar"
@@ -2052,81 +2047,81 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
msgid "Read error from %s process"
msgstr "S'ha produït un error en llegir des del procés %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor HTTP té el suport d'abast trencat"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "S'ha produït un error en escriure al fitxer de sortida"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "S'ha produït un error en llegir des del servidor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "No s'ha pogut truncar el fitxer %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Error intern"
@@ -2134,12 +2129,12 @@ msgstr "Error intern"
msgid "Can't mmap an empty file"
msgstr "No es pot transferir un fitxer buit a memòria"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2148,13 +2143,6 @@ msgstr ""
"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
"Valor actual: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2541,14 +2529,14 @@ msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2560,7 +2548,7 @@ msgstr ""
"dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
"LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2638,12 +2626,12 @@ msgstr "El mètode %s no s'ha iniciat correctament"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetament «%s» no està suportat"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2786,19 +2774,19 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "La suma MD5 no concorda"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2808,7 +2796,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2817,7 +2805,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2825,7 +2813,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "La mida no concorda"
@@ -2960,78 +2948,101 @@ msgstr ""
"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
"coincidents\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "S'està obrint el fitxer de configuració %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "La suma resum no concorda"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "S'està instal·lant %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "S'està configurant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "S'està suprimint el paquet %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "S'ha suprimit completament el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "S'està executant l'activador de postinstal·lació %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Manca el directori «%s»"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "S'està preparant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "S'està desempaquetant %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "S'està preparant per a configurar el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "S'ha instal·lat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "S'està preparant per a la supressió del paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "S'ha suprimit el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "S'està preparant per a suprimir completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "S'ha suprimit completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
"pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3057,30 +3068,20 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "No s'ha pogut aplicar el pedaç al fitxer"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La connexió s'ha tancat prematurament"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "No source package '%s' picking '%s' instead\n"
#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n"
-#~ msgid "Could not patch file"
-#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
-
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/cs.po b/po/cs.po
index 62b45a6c8..3657a68ba 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-16 18:05+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -144,14 +144,9 @@ msgstr " Vypíchnutý balík: "
msgid " Version table:"
msgstr " Tabulka verzí:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pro %s zkompilován na %s %s\n"
@@ -646,7 +641,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -807,11 +802,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nelze pÅ™eÄíst seznam zdrojů."
@@ -841,8 +836,8 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po této operaci bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu urÄit volné místo v %s"
@@ -879,7 +874,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokraÄovat [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -888,7 +883,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Stahování dokonÄeno v režimu pouze stáhnout"
@@ -986,51 +981,51 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1048,43 +1043,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnitřní chyba, AutoRemover pokazil věci"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Nemohu najít úlohu %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nastaven jako instalovaný ruÄnÄ›.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1092,7 +1087,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1103,124 +1098,124 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "DoporuÄované balíky:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "PropoÄítávám aktualizaci... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor „%s“\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíÄek „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1229,31 +1224,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1337,7 +1332,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tato APT má schopnosti svaté krávy.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1585,7 +1580,7 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1752,11 +1747,11 @@ msgid "File not found"
msgstr "Soubor nebyl nalezen"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Nelze nastavit Äas modifikace"
@@ -1765,34 +1760,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Neplatné URI, lokální URI nesmí zaÄínat na //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Přihlašuji se"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nemohu urÄit jméno druhé strany"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nemohu urÄit lokální jméno"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Server zamítl naše spojení a řekl: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER selhal, server řekl: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS selhal, server řekl: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1800,114 +1795,114 @@ msgstr ""
"Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin "
"je prázdný."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE selhal, server řekl: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Čas spojení vypršel"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Server uzavřel spojení"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Chyba Ätení"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "OdpovÄ›Ä pÅ™eplnila buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Porušení protokolu"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Chyba zápisu"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nemohu vytvořit socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Nemohu pÅ™ipojit datový socket, Äas spojení vyprÅ¡el"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nemohu připojit pasivní socket."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo nezískal naslouchající socket"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nemohu navázat socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Nemohu naslouchat na socketu"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Nemohu urÄit jméno socketu"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Nemohu odeslat příkaz PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Neznámá rodina adres %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT selhal, server řekl: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Spojení datového socketu vypršelo"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Nemohu stáhnout soubor, server řekl „%s“"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Datový socket vypršel"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Přenos dat selhal, server řekl „%s“"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nemohu vyvolat "
@@ -2018,80 +2013,80 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba Ätení z procesu %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "ÄŒekám na hlaviÄky"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlaviÄky pÅ™es %u znaků"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Chybná hlaviÄka"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlaviÄku odpovÄ›di"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlaviÄku Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlaviÄku Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba Ätení ze serveru. Druhá strana zavÅ™ela spojení"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Chyba Ätení ze serveru"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Nelze zmenšit soubor"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2099,25 +2094,18 @@ msgstr "Vnitřní chyba"
msgid "Can't mmap an empty file"
msgstr "Nemohu provést mmap prázdného souboru"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2504,14 +2492,14 @@ msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2522,7 +2510,7 @@ msgstr ""
"smyÄce v Conflicts/Pre-Depends. To je Äasto Å¡patné, ale pokud to skuteÄnÄ› "
"chcete udělat, aktivujte možnost APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2597,12 +2585,12 @@ msgstr "Metoda %s nebyla spuštěna správně"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "BalíÄkovací systém „%s“ není podporován"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno urÄit vhodný typ balíÄkovacího systému"
@@ -2736,19 +2724,19 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 souÄtů"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních souÄtů"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíÄů není dostupný veÅ™ejný klíÄ:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2757,7 +2745,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je tÅ™eba opravit ruÄnÄ› (kvůli chybÄ›jící architektuÅ™e)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2766,14 +2754,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ruÄnÄ›."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2907,76 +2895,99 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Otevírám konfiguraÄní soubor %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Neshoda kontrolních souÄtů"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Instaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Nastavuji %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Odstraňuji %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Kompletně odstraněn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "SpouÅ¡tím poinstalaÄní spouÅ¡tÄ›Ä %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresář „%s“ chybí"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Připravuji %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Připravuji nastavení %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Nainstalován %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Připravuji odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Připravuji úplné odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3002,26 +3013,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nemohu záplatovat soubor"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Spojení bylo pÅ™edÄasnÄ› ukonÄeno"
-#~ msgid "Could not patch file"
-#~ msgstr "Nemohu záplatovat soubor"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/cy.po b/po/cy.po
index 966bc6902..8b8382a0c 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -162,14 +162,9 @@ msgstr " Pin Pecyn: "
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -675,7 +670,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -845,11 +840,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -878,8 +873,8 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -917,7 +912,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -926,7 +921,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -1027,50 +1022,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1086,46 +1081,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1134,7 +1129,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1146,118 +1141,118 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1266,7 +1261,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1275,34 +1270,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1387,7 +1382,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1644,7 +1639,7 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1825,11 +1820,11 @@ msgid "File not found"
msgstr "Ffeil heb ei ganfod"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -1838,34 +1833,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Yn mewngofnodi"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Ni ellir darganfod enw'r cymar"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Ni ellir darganfod yr enw lleol"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, fuzzy, c-format
msgid "The server refused the connection and said: %s"
msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1874,117 +1869,117 @@ msgstr ""
"ProxyLogin yn wag.)"
# FIXME
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Goramser cysylltu"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Gwall darllen"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Gorlifodd ateb y byffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Gwall ysgrifennu"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Methwyd creu soced"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
#, fuzzy
msgid "Could not connect passive socket."
msgstr "Methwyd cysylltu soced goddefol"
# FIXME
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Methodd getaddrinfo gael soced gwrando"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Methwyd rhwymo soced"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Methwyd gwrando ar y soced"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Methwyd canfod enw'r soced"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Methwyd danfod gorchymyn PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Goramserodd cysylltiad y soced data"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Goramserodd soced data"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Ymholiad"
# FIXME
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
@@ -2093,87 +2088,87 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:593
+#: methods/http.cc:594
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:608
+#: methods/http.cc:609
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:610
+#: methods/http.cc:611
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:889
+#: methods/http.cc:891
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2181,25 +2176,18 @@ msgstr "Gwall mewnol"
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2598,7 +2586,7 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
@@ -2606,7 +2594,7 @@ msgid ""
msgstr ""
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2617,7 +2605,7 @@ msgstr ""
"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2698,12 +2686,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
@@ -2843,21 +2831,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2866,7 +2854,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2875,14 +2863,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -3014,76 +3002,97 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3109,27 +3118,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "Methwyd agor ffeil %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Caewyd y cysylltiad yn gynnar"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "Methwyd agor ffeil %s"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/da.po b/po/da.po
index 6cbe352fa..9d2f234c4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2007-09-06 21:40+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -150,14 +150,9 @@ msgstr " Pakke-pin: "
msgid " Version table:"
msgstr " Versionstabel:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s oversat %s %s\n"
@@ -655,7 +650,7 @@ msgstr "Kunne ikke omdøbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -816,11 +811,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldført"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Kunne ikke låse nedhentningsmappen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke læses."
@@ -849,8 +844,8 @@ msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -887,7 +882,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsætte [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -896,7 +891,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -996,51 +991,51 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Kunne ikke låse listemappen"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
"AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Brug 'apt-get autoremove' til at fjerne dem."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1058,43 +1053,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern fejl. AutoRemover ødelagde noget"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade ødelagde noget"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunne ikke finde opgaven %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1102,7 +1097,7 @@ msgstr ""
"Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
"en løsning)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1113,115 +1108,115 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgængelige."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Følgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Foreslåede pakker:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Færdig"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemløseren ødelagde noget"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhængigheder.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1224,7 @@ msgid ""
msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1238,32 +1233,32 @@ msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1347,7 +1342,7 @@ msgstr ""
"for flere oplysninger og tilvalg.\n"
" Denne APT har \"Super Cow Powers\".\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1600,7 +1595,7 @@ msgstr "File %s/%s overskriver filen i pakken %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1769,11 +1764,11 @@ msgid "File not found"
msgstr "Fil blev ikke fundet"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -1782,34 +1777,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ugyldig URI, lokale URI'er må ikke starte med //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Logget på"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Kunne ikke bestemme serverens navn"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Kunne ikke bestemme det lokale navn"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Serveren nægtede os forbindelse og sagde: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1817,114 +1812,114 @@ msgstr ""
"Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::"
"ProxyLogin er tom."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Logpå-skriptets kommando '%s' mislykkedes. Serveren sagde: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE mislykkedes. Serveren sagde: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Tidsudløb på forbindelsen"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Serveren lukkede forbindelsen"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Læsefejl"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Mellemlageret blev overfyldt af et svar."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokolfejl"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivefejl"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Kunne ikke oprette sokkel"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Kunne ikke forbinde passiv sokkel."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo kunne ikke få en lyttesokkel"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Kunne ikke tilknytte en sokkel"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Kunne ikke lytte på soklen"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Kunne ikke finde soklens navn"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Kunne ikke sende PORT-kommando"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Ukendt adressefamilie %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT mislykkedes. Serveren sagde: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Tidsudløb på datasokkel-forbindelse"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Kunne ikke hente fil. Serveren sagde '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Tidsudløb ved datasokkel"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Forespørgsel"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Kunne ikke udføre "
@@ -2036,82 +2031,82 @@ msgstr "Kunne ikke åbne datarør for %s"
msgid "Read error from %s process"
msgstr "Læsefejl fra %s-process"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Tidsudløb på forbindelsen"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Fejl ved læsning fra server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Kunne ikke skrive filen %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Intern fejl"
@@ -2119,25 +2114,18 @@ msgstr "Intern fejl"
msgid "Can't mmap an empty file"
msgstr "Kan ikke udføre mmap for en tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udføre mmap for %lu byte"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2523,14 +2511,14 @@ msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2542,7 +2530,7 @@ msgstr ""
"idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-"
"LoopBreak'."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2619,12 +2607,12 @@ msgstr "Metoden %s startede ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understøttes ikke"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2759,21 +2747,21 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdøbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2782,7 +2770,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2791,13 +2779,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
@@ -2931,76 +2919,98 @@ msgstr "Skrev %i poster med %i ikke-trufne filer\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Åbner konfigurationsfilen %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum stemmer ikke"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Installerede %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Sætter %s op"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Fjernede %s helt"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Listemappen %spartial mangler."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Klargør %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Pakker %s ud"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Gør klar til at sætte %s op"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Installerede %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Gør klar til afinstallation af %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Fjernede %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Gør klar til at fjerne %s helt"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3026,26 +3036,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Kunne ikke påføre filen %s en lap"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen lukkedes for hurtigt"
-#~ msgid "Could not patch file"
-#~ msgstr "Kunne ikke påføre filen %s en lap"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/de.po b/po/de.po
index 898f28884..982ba7f15 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-10-20 21:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -148,14 +148,9 @@ msgstr " Paket-Pinning: "
msgid " Version table:"
msgstr " Versions-Tabelle:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s für %s, kompiliert am %s %s\n"
@@ -669,7 +664,7 @@ msgstr "%s konnte nicht in %s umbenannt werden"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
@@ -831,11 +826,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -866,8 +861,8 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Freier Platz in %s konnte nicht bestimmt werden"
@@ -904,7 +899,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
@@ -913,7 +908,7 @@ msgstr "Fehlschlag beim Holen von %s %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
@@ -1015,35 +1010,35 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden."
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« akzeptiert keine Argumente"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Das Listenverzeichnis kann nicht gesperrt werden"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1051,17 +1046,17 @@ msgstr ""
"Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
"benötigt:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1080,44 +1075,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Task %s konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Paket %s konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s wurde als manuell installiert festgelegt.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1125,7 +1120,7 @@ msgstr ""
"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
"jegliche Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1137,120 +1132,120 @@ msgstr ""
"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"erstellt wurden oder Incoming noch nicht verlassen haben."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade (Paketaktualisierung) ..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Quellpaket für %s kann nicht gefunden werden"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Quelle %s wird heruntergeladen\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ãœberspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bau-Abhängigkeiten.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1259,7 +1254,7 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1268,32 +1263,32 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
"Version des Pakets %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %"
"s ist zu neu."
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1384,7 +1379,7 @@ msgstr ""
"weitergehende Informationen und Optionen.\n"
" Dieses APT hat Super-Kuh-Kräfte.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1640,7 +1635,7 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1812,11 +1807,11 @@ msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "»stat« konnte nicht ausgeführt werden."
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden"
@@ -1825,34 +1820,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Anmeldung läuft"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Name des Kommunikationspartners kann nicht bestimmt werden"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Lokaler Name kann nicht bestimmt werden"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Verbindung durch Server abgelehnt: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Befehl USER fehlgeschlagen: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Befehl PASS fehlgeschlagen: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1860,116 +1855,116 @@ msgstr ""
"Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::"
"ProxyLogin ist leer."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Befehl TYPE fehlgeschlagen: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Zeitüberschreitung der Verbindung"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Verbindung durch Server geschlossen"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Lesefehler"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Durch eine Antwort wurde der Puffer zum Ãœberlaufen gebracht."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokoll beschädigt"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Schreibfehler"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Socket konnte nicht erzeugt werden"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Passiver Socket konnte nicht verbunden werden."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
"Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket "
"gefunden"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Verbindung des Sockets nicht möglich"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Warten auf Verbindungen auf dem Socket nicht möglich"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Name des Sockets konnte nicht bestimmt werden"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "PORT-Befehl konnte nicht gesendet werden"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Unbekannte Adressfamilie %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Befehl EPRT fehlgeschlagen: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Verbindung konnte nicht angenommen werden"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Datei konnte nicht heruntergeladen werden; Antwort vom Server: »%s«"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Datenverbindung erlitt Zeitüberschreitung"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Datenübertragung fehlgeschlagen; Antwort vom Server: »%s«"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Abfrage"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Kann nicht aufgerufen werden: "
@@ -2086,83 +2081,83 @@ msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Warten auf Kopfzeilen"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Einzelne Kopfzeile aus %u Zeichen erhalten"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ungültige Kopfzeile"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Vom·HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
"Teilweise Dateiübertragung·wird vom HTTP-Server nur fehlerhaft unterstützt."
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben der Ausgabedatei"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
"anderen Seite geschlossen"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Datei konnte nicht eingekürzt werden"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2170,12 +2165,12 @@ msgstr "Interner Fehler"
msgid "Can't mmap an empty file"
msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap von %lu Bytes konnte nicht durchgeführt werden"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2184,13 +2179,6 @@ msgstr ""
"Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::"
"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2580,14 +2568,14 @@ msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2599,7 +2587,7 @@ msgstr ""
"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
"die Option APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2679,12 +2667,12 @@ msgstr ""
"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und drücken "
"Sie die Eingabetaste."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem »%s« wird nicht unterstützt"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Bestimmung eines passenden Paketierungssystem-Typs nicht möglich"
@@ -2830,20 +2818,20 @@ msgstr "E/A-Fehler beim Speichern des Quell-Caches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2853,7 +2841,7 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2862,14 +2850,14 @@ 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:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
@@ -3006,78 +2994,101 @@ msgstr ""
"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
"geschrieben.\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Öffne Konfigurationsdatei %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash-Summe stimmt nicht überein"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installieren von %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Konfigurieren von %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s wird entfernt"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s vollständig entfernt"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Aufruf des Nach-Installations-Triggers %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Verzeichnis »%s« fehlt"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s wird entpackt"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Konfiguration von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s installiert"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Entfernen von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s entfernt"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Vollständiges Entfernen von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Schreiben des Protokolls nicht möglich, openpty() schlug fehl (/dev/pts "
"nicht eingehangen?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr "Ausführen von dpkg"
@@ -3108,26 +3119,16 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Datei konnte nicht gepatcht werden"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbindung vorzeitig beendet"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "No source package '%s' picking '%s' instead\n"
#~ msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Datei konnte nicht gepatcht werden"
diff --git a/po/dz.po b/po/dz.po
index 5b9d0f73e..aa75a0ddd 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -150,14 +150,9 @@ msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་à½à½–་གཟེར:"
msgid " Version table:"
msgstr "à½à½¼à½“་རིམ་à½à½²à½‚་à½à¾²à½˜à¼:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr "%4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
@@ -660,7 +655,7 @@ msgstr "%s་ལུ་%s་བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ནིà¼
msgid "Y"
msgstr "à½à½ à½²à¼"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -823,11 +818,11 @@ msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་རྩ་བསà¾à¾²à½‘་བà½
msgid "Internal error, Ordering didn't finish"
msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བསà¼"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རà¾à¾±à½–ས་མ་ཚུགས་པསà¼"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "འབྱུང་à½à½´à½„ས་ཚུ་ཀྱི་à½à½¼à¼‹à½¡à½²à½‚་དེ་ལྷག་མི་ཚུགས་པསà¼"
@@ -858,8 +853,8 @@ msgstr "à½à¼‹à½¦à¾à½¼à½„་གི་%sB་འདི་བཤུབ་པའི
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལà½à¼‹à½¦à¾¦à½ºà¼‹à½£à½´à½¦à¼‹à½ à½¼à½„་à¼\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
@@ -896,7 +891,7 @@ msgstr "བར་བཤོལ་འབདà¼"
msgid "Do you want to continue [Y/n]? "
msgstr "à½à¾±à½¼à½“་ཀྱི་འཕྲོ་མà½à½´à½‘་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
@@ -905,7 +900,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–à¾
msgid "Some files failed to download"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་à½à½–ས་ལམ་རà¾à¾±à½„མ་གཅིག་ནང་མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་ཕབ་ལེན་འབདà¼"
@@ -1005,50 +1000,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "(%s)གི་དོན་ལུ་སེལ་འà½à½´à¼‹à½ à½–ད་ཡོད་པའི་འà½à½¼à½“་རིམ་'%s'(%s)\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "འབྱུང་à½à½´à½„ས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་à½à½¼à¼‹à½¡à½²à½‚་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགསà¼"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "དུས་མà½à½´à½“་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབདà¼"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "à½à½¼à¼‹à½–ཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རà¾à¾±à½–་མ་ཚུགསà¼"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིས་གསརཔ་འདི་ཚུ་à½à½žà½²à¼‹à½–ཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིས་གསརཔ་འདི་ཚུ་à½à½žà½²à¼‹à½–ཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1064,44 +1059,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སà¾à½–ས་འདི་མོས་མà½à½´à½“་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ དཀའ་ངལ་མོས་མà½à½´à½“་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་à½à½£à¼‹à½¡à½¼à½‘à¼"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསà¾à¾±à½ºà½‘་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་à½à½£à¼‹à½¡à½¼à½‘à¼"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "%s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འཚོལ་མ་à½à½¼à½–à¼"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "%s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འཚོལ་མ་à½à½¼à½–à¼"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འà½à½´à¼‹à½ à½–ད་དོà¼\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "འདི་འབདà½à¼‹à½‘་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིནà¼"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་à½à¾±à½¼à½‘་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1109,7 +1104,7 @@ msgstr ""
"མ་ཚང་བའི་རྟེན་འབྲེལ་ à½à½´à½¦à¼‹à½¦à¾’ྲིལ་མེད་མི་ཚུ་དང་གཅིག་à½à½¢à¼‹ 'apt-get -f install'དེ་འབà½à¼‹à½¢à¾©à½¼à½£à¼‹à½–སà¾à¾±à½ºà½‘པà¼"
"(ཡང་ན་à½à½–ས་ཤེས་ཅིག་གསལ་བཀོད་འབདà¼)"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1120,122 +1115,122 @@ msgstr ""
"འབད་འབདà½à¼‹à½ à½¼à½„་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསà¾à¾²à½´à½“་མ་འབད་བར་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
"འབྱོར་གྱི་ཕྱི་à½à½¢à¼‹à½¢à¾©à¼‹à½–སà¾à¾²à½‘་བà½à½„་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འà½à½–་དོ་ཡོདཔ་འོང་ནི་ཨིན་པསà¼"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "ཆད་པ་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུà¼"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་à½à½ºà½–ས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "ཡར་བསà¾à¾±à½ºà½‘་རྩིས་བà½à½¼à½“་དོ་... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "འབད་ཚར་ཡིà¼"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ དཀའ་ངལ་མོས་མà½à½´à½“་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་à½à½£à¼‹à½¡à½¼à½‘à¼"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་à½à½´à½„ས་ལེན་ནི་ལུ་ཉུང་མà½à½ à¼‹à½¢à½„་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་à½à½´à½„ས་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་འཚོལ་མ་འà½à½¼à½–"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr " %s་ནང་à½à¾±à½¼à½‘་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་à½à½´à½„ས་ཡིག་མཛོད་ཀྱི་%sBà¼\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་à½à½´à½„ས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསསà¼\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་à½à½´à½„ས་ལེནà¼\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོà¼\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གà½à½„་འབདà¼\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ནུག"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མà½à½ à¼‹à½¢à½„་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགསà¼"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%sà½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་འà½à½¼à½–་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པསà¼"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1244,32 +1239,32 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སà¾à½¼à½„་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་à½à½´à½˜à¼‹à½¦à¾’རིལ་%s་གི་འà½à½¼à½“་རིམ་"
"ཚུ་འà½à½¼à½–་མ་ཚུགསཔ་ལས་བརྟེན་འà½à½¼à½“་རིམ་དགོས་མà½à½¼à¼‹à½šà½´à¼‹à½‚ི་རེ་བ་དོ་སà¾à½¼à½„་མ་ཚུགས་པསà¼"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སà¾à½¼à½„་ནི་འདི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་à½à½´à½˜à¼‹"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པསà¼"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ནུག"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པསà¼"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིནà¼"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½ à½–ད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1356,7 +1351,7 @@ msgstr ""
"ཤོག་ལེབ་ཚུ་ལུ་བལྟà¼\n"
" འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོདà¼\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1610,7 +1605,7 @@ msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་%s་ནང་ལུ་་ཡིག་སà
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1777,11 +1772,11 @@ msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་à½à½¼à½–à¼"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབà½à¼‹à½“ི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
@@ -1790,34 +1785,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་ ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་à½à½¢à¼‹à½ à½‚ོ་བཙུགས་ནི་མི་འོང་à¼"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "ནང་བསà¾à¾±à½¼à½‘་འབད་དོà¼"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "དོ་བཉམ་གི་མིང་འདི་གà½à½“་འབེབས་བཟོ་མ་ཚུགསà¼"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "ཉེ་གནས་མིང་འདི་གà½à½“་འབེེབས་བཟོ་མ་ཚུགསà¼"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "སར་བར་འདི་གིས་ མà½à½´à½‘་ལམ་འདི་ངོས་ལེན་འབད་མ་བà½à½´à½–་པར་སླབ་མས: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "ལག་ལེན་པ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "རྩི་སྤྲོད་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས་: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1825,114 +1820,114 @@ msgstr ""
"པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདà½à¼‹à½‘་ ནང་བསà¾à¾±à½¼à½‘་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::"
"ProxyLoginའདི་སྟོངམ་ཨིན་པསà¼"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "ནང་བསà¾à¾±à½¼à½‘་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འà½à½¼à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "ཡིག་དཔར་རà¾à¾±à½–་མ་བà½à½´à½–་སར་བར་གྱིས་སླབ་མས༠%s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "མà½à½´à½‘་ལམ་ངལ་མཚམས"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "སར་བར་གྱིས་མà½à½´à½‘་ལམ་འདི་à½à¼‹à½–སྡམས་à½à½ºà¼‹à½¡à½¼à½‘པ་ཨིནà¼"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "འཛོལ་བ་ལྷབà¼"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "ལན་གྱིས་ གནད་à½à½¼à½„ས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིནà¼"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅནà¼"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "འཛོལ་བ་འབྲིà¼"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "སོ་ཀེཊི་ཅིག་གསར་བསà¾à¾²à½´à½“་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིནà¼"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་མà½à½´à½‘་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མà½à½´à½‘་ལམ་ངལ་མཚམསà¼"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མà½à½´à½‘་མ་ཚུགསà¼"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགསà¼"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགསà¼"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགསà¼"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "སོ་ཀེཊི་གི་མིང་འདི་གà½à½“་འབེབས་བཟོ་མ་ཚུགསà¼"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བà½à½„་མ་ཚུགསà¼"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "མ་ཤེས་པའི་à½à¼‹à½–ྱང་གི་རིགས་ཚན་%u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "ཨི་པི་ཨར་ཊི་ འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་གིས་སླབ་མས:%s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་ མà½à½´à½‘་ནི་ངལ་མཚམས་བྱུང་ནུག"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "མà½à½´à½‘་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགསà¼"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལà¼"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམསà¼"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "གནད་སྡུད་གནས་སོར་དེ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོད་ སར་བར་'%s'་གིས་སླབ་མསà¼"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "འདྲི་དཔྱདà¼"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "ལས་བཀོལ་འབད་མ་ཚུགསà¼"
@@ -2046,81 +2041,81 @@ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདà
msgid "Read error from %s process"
msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོà¼"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རà¾à¾±à½„་པ་ཅིག་à½à½¼à½–་ཡོདà¼"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "མགོ་ཡིག་གི་གྲལ་à½à½²à½‚་བྱང་ཉེསà¼"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-à½à¾±à½–་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བà½à½„་ཡོདà¼"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ à½à¾±à½–་ཚད་ཀྱི་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½‘ེ་ཆད་པ་བཟོ་བà½à½„་ནུག"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "སེལ་འà½à½´à¼‹à½ à½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "མà½à½´à½‘་ལམ་ངལ་མཚམས་འབད་ཡོདà¼"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིà½à¼‹à½‘་འཛོལ་བà¼"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "ཡིག་སྣོད་ལུ་འབྲིà½à¼‹à½‘་འཛོལ་བà¼"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིà½à¼‹à½‘་འཛོལ་བà¼"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ༠à½à½‚་རིང་མཇུག་གི་མà½à½´à½‘་ལམ་དེ་à½à¼‹à½–སྡམསà¼"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བà¼"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེསà¼"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "བà½à½´à½‘་ལམ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "ནང་འà½à½¼à½‘་འཛོལ་བà¼"
@@ -2128,25 +2123,18 @@ msgstr "ནང་འà½à½¼à½‘་འཛོལ་བà¼"
msgid "Can't mmap an empty file"
msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགསà¼"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགསà¼"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2534,14 +2522,14 @@ msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་à½à½²à½‚་%u་ག
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་à½à½²à½‚་%u་ འབྱུང་à½à½´à½„ས་à½à½¼à¼‹à½¡à½²à½‚་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ནà¼"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2553,7 +2541,7 @@ msgstr ""
"འདི་འབདà½à¼‹à½‘་à½à¾±à½¼à½‘་ཀྱི་à½à½‘་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་à½à¼‹à½ à½‘ི་ཤུགས་"
"ལྡན་བཟོà¼"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2630,12 +2618,12 @@ msgstr "à½à½–ས་ལམ་ %s འདི་ངེས་བདེན་སྦà½
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "à½à¼‹à½¡à½²à½‚་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་༠'%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབà¼à¼‹"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སà¾à¾±à½¼à½¢à¼‹à½˜à¼‹à½ à½–ད་བསà¼"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གà½à½“་འབེབས་བཟོ་མི་ཚུགས་པསà¼"
@@ -2770,20 +2758,20 @@ msgstr "IO འཛོལ་བ་འབྱུང་à½à½´à½„ས་འདྲ་མ
msgid "rename failed, %s (%s -> %s)."
msgstr "%s (%s -> %s)བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ནི་འདི་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔ་ཨིནà¼"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ à½à¾±à½¼à½“་བསྡོམས་མ་མà½à½´à½“་པà¼"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ à½à¾±à½¼à½“་བསྡོམས་མ་མà½à½´à½“་པà¼"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འà½à½¼à½–་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2792,7 +2780,7 @@ msgstr ""
" %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འà½à½¼à½–་པས༠འདི་འབདà½à¼‹à½£à½¦à¼‹à½à¾±à½¼à½‘་ཀྱི་ལག་à½à½¼à½‚་ལས་ "
"འ་ནི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེནà¼)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2801,14 +2789,14 @@ msgstr ""
" %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འà½à½¼à½–་པས༠འདི་འབདà½à¼‹à½£à½¦à¼‹à½à¾±à½¼à½‘་ཀྱི་ལག་à½à½¼à½‚་ལས་ "
"འ་ནི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ ཟུར་à½à½¼à¼‹à½¡à½²à½‚་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་དོན་ལུ་ས་སྒོà¼"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "ཚད་མ་མà½à½´à½“à¼"
@@ -2942,76 +2930,98 @@ msgstr ""
"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམà½à½´à½“་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་à½à½¢à¼‹ %i དྲན་à½à½¼à¼‹à½ à½‘ི་ཚུ་བྲིས་"
"ཡོདཔ་ཨིནà¼\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½‘ོà¼"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "ཨེམ་ཌི་༥་ à½à¾±à½¼à½“་བསྡོམས་མ་མà½à½´à½“་པà¼"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%sà¼"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s་རིམ་སྒྲིག་འབད་དོà¼"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s་རྩ་བསà¾à¾²à½‘་གà½à½„་དོà¼"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་རྩ་བསà¾à¾²à½‘་བà½à½„་ཡོདà¼"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "à½à½¼à¼‹à½–ཀོད་འབད་མི་སྣོད་à½à½¼à¼‹%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་à½à½ºà¼‹à½ à½‘ུག"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s་ གྲ་སྒྲིག་འབད་དོà¼"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོà¼"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོà¼"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%sà¼"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s་ རྩ་བསà¾à¾²à½‘་གà½à½„་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོà¼"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "རྩ་བསà¾à¾²à½‘་བà½à½„་ཡོད་པའི་%s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་རྩ་བསà¾à¾²à½‘་གà½à½„་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོà¼"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུà½à¼‹à½¦à¾¦à½ºà¼‹à½¢à½„་རྩ་བསà¾à¾²à½‘་བà½à½„་ཡོདà¼"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3037,27 +3047,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "%s་ཡིག་སྣོད་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "དུས་སུ་མ་འབབ་པ་རང་མà½à½´à½‘་ལམ་འདི་ག་བསྡམས་ཡོདà¼"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "%s་ཡིག་སྣོད་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà½´à½‚སà¼"
+#~ msgid " %4i %s\n"
+#~ msgstr "%4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/el.po b/po/el.po
index 501849a00..b4800b8be 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -156,14 +156,9 @@ msgstr " Καθήλωση Πακέτου: "
msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
@@ -668,7 +663,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -832,11 +827,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "ΕσωτεÏικό Σφάλμα, η Ταξινόμηση δεν ολοκληÏώθηκε"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "ΑδÏνατο το κλείδωμα του καταλόγου μεταφόÏτωσης"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ΑδÏνατη η ανάγνωση της λίστας πηγών."
@@ -868,8 +863,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Μετά από αυτή τη λειτουÏγία, θα ελευθεÏωθοÏν %sB χώÏου από το δίσκο.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόÏεσα να Ï€ÏοσδιοÏίσω τον ελεÏθεÏο χώÏο στο %s"
@@ -906,7 +901,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Î/ο]; "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -915,7 +910,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μεÏικά αÏχεία απέτυχε η μεταφόÏτωση"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "ΟλοκληÏώθηκε η μεταφόÏτωση μόνο"
@@ -1018,50 +1013,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "ΑδÏνατη η εÏÏεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίÏνει οÏίσματα"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "ΑδÏνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Δεν επιτÏέπεται οποιαδήποτε διαγÏαφή· αδυναμία εκκίνησης του AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χÏειάζονται πλέον:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χÏειάζονται πλέον:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ΧÏησιμοποιήστε 'apt-get autoremove' για να τα διαγÏάψετε."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1079,43 +1074,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληÏοφοÏίες ίσως βοηθήσουν στην επίλυση του Ï€Ïοβλήματος:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "ΕσωτεÏικό Σφάλμα, το AutoRemover δημιοÏÏγησε κάποιο Ï€Ïόβλημα"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ΕσωτεÏικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "ΑδÏνατη η εÏÏεση του συνόλου πακέτων %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "ΑδÏνατη η εÏÏεση του πακέτου %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέÏι\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν Ï„Ïέξετε 'apt-get -f install' ίσως να διοÏθώσετε αυτά τα Ï€Ïοβλήματα:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1123,7 +1118,7 @@ msgstr ""
"Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε 'apt-get -f install' χωÏίς να οÏίσετε "
"πακέτο (ή καθοÏίστε μια λÏση)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1135,120 +1130,120 @@ msgstr ""
"διανομή, ότι μεÏικά από τα πακέτα δεν έχουν ακόμα δημιουÏγηθεί ή έχουν\n"
"μετακινηθεί από τα εισεÏχόμενα."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθοÏν:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "ΠÏοτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"ΕσωτεÏικό Σφάλμα, η Ï€Ïοσπάθεια επίλυσης του Ï€Ïοβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα Ï€Ïέπει να καθοÏίσετε τουλάχιστον ένα πακέτο για να μεταφοÏτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ΠαÏάκαμψη του ήδη μεταφοÏτωμένου αÏχείου `%s`\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αÏκετό ελεÏθεÏο χώÏο στο %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "ΜεταφόÏτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόÏτωσης μεÏικών αÏχειοθηκών."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "ΠαÏάκαμψη της αποσυμπίεσης ήδη μεταφοÏτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Η απογονική διεÏγασία απέτυχε"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα Ï€Ïέπει να καθοÏίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαÏτήσεων του"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ΑδÏνατη η εÏÏεση πληÏοφοÏιών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαÏτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1256,7 +1251,7 @@ msgid ""
msgstr ""
"%s εξαÏτήσεις για το %s δεν ικανοποιοÏνται επειδή το πακέτο %s δεν βÏέθηκε"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1265,32 +1260,32 @@ msgstr ""
"%s εξαÏτήσεις για το %s δεν ικανοποιοÏνται επειδή δεν υπάÏχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιοÏν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαÏτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτεÏο"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάÏτησης για το %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαÏτήσεις χτισίματος για το %s δεν ικανοποιοÏνται."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεÏγασίας εξαÏτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "ΥποστηÏιζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1373,7 +1368,7 @@ msgstr ""
"για πεÏισσότεÏες πληÏοφοÏίες και επιλογές.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1626,7 +1621,7 @@ msgstr "Το αÏχείο %s/%s αντικαθιστά αυτό στο πακέÏ
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1794,11 +1789,11 @@ msgid "File not found"
msgstr "Το αÏχείο Δε Î’Ïέθηκε"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Αποτυχία εÏÏεσης της κατάστασης"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Αποτυχία οÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… χÏόνου Ï„Ïοποποίησης"
@@ -1807,34 +1802,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Μη έγκυÏο URI, τα τοπικά URI δεν Ï€Ïέπει να αÏχίζουν με //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "ΣÏνδεση στο σÏστημα"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "ΑδÏνατος ο καθοÏισμός του ονόματος του ομότιμου (peer)"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "ΑδÏνατος ο καθοÏισμός του Ï„Î¿Ï€Î¹ÎºÎ¿Ï Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Ο διακομιστής αÏνήθηκε την σÏνδεση με μήνυμα: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1842,114 +1837,114 @@ msgstr ""
"Ο διαμεσολαβητής έχει οÏιστεί αλλά χωÏίς σενάÏιο εισόδου, το Acquire::ftp::"
"ProxyLogin είναι άδειο"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Η εντολή '%s' στο σενάÏιο εισόδου απέτυχε, ο διακομιστής απάντησε: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Λήξη χÏόνου σÏνδεσης"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Ο διακομιστής έκλεισε την σÏνδεση"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Σφάλμα ανάγνωσης"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Το μήνυμα απάντησης υπεÏχείλισε την ενδιάμεση μνήμη."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Αλλοίωση του Ï€Ïωτοκόλλου"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Σφάλμα εγγÏαφής"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "ΑδÏνατη η δημιουÏγία μιας υποδοχής (socket)"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "ΑδÏνατη η σÏνδεση υποδοχής δεδομένων, λήξη χÏόνου σÏνδεσης"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "ΑδÏνατη η σÏνδεση σε παθητική υποδοχή (socket)."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Το getaddrinfo ήταν αδÏνατο να δέσμευση υποδοχή παÏακολοÏθησης"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "ΑδÏνατη η Ï€Ïόσδεση στην υποδοχή (socket)"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "ΑδÏνατη η παÏακολοÏθηση της υποδοχής (socket)"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "ΑδÏνατος ο καθοÏισμός του ονόματος της υποδοχής (socket)"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "ΑδÏνατη η αποστολή της εντολής PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Άγνωστη οικογένεια διευθÏνσεων %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Λήξη χÏόνου σÏνδεσης στην υποδοχή δεδομένων"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "ΑδÏνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ΠÏόβλημα κατά το hashing του αÏχείου"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Αδυναμία λήψης του αÏχείου, ο διακομιστής απάντησε '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Λήξη χÏόνου υποδοχής δεδομένων"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Αποτυχία κατά τη μεταφοÏά δεδομένων, ο διακομιστής απάντησε '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "ΕπεÏώτηση"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "ΑδÏνατη η εκτέλεση"
@@ -2063,82 +2058,82 @@ msgstr "ΑδÏνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεÏγασία %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γÏαμμής επικεφαλίδας πάνω από %u χαÏακτήÏες"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ελαττωματική γÏαμμή επικεφαλίδας"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα απάντησης"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηÏίζει πλήÏως το range"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Άγνωστη μοÏφή ημεÏομηνίας"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Λήξη χÏόνου σÏνδεσης"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο εξόδου"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκÏο έκλεισε τη σÏνδεση"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Αποτυχία εγγÏαφής του αÏχείου %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Η σÏνδεση απέτυχε"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "ΕσωτεÏικό Σφάλμα"
@@ -2146,25 +2141,18 @@ msgstr "ΕσωτεÏικό Σφάλμα"
msgid "Can't mmap an empty file"
msgstr "ΑδÏνατη η απεικόνιση mmap ενός άδειου αÏχείου"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "ΑδÏνατη η απεικόνιση μέσω mmap %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2555,14 +2543,14 @@ msgstr "Ο Ï„Ïπος '%s' στη γÏαμμή %u στη λίστα πηγών %
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Λάθος μοÏφή της γÏαμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2574,7 +2562,7 @@ msgstr ""
"είναι καλό, αλλά εάν Ï€Ïαγματικά θέλετε να συνεχίσετε ενεÏγοποιήστε την "
"επιλογή APT::Force-LoopBreak option."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2653,12 +2641,12 @@ msgstr ""
"ΠαÏακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
"enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σÏστημα συσκευασίας '%s' δεν υποστηÏίζεται"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "ΑδÏνατος ο καθοÏισμός ενός κατάλληλου Ï„Ïπου συστήματος πακέτων"
@@ -2798,19 +2786,19 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάÏχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2819,7 +2807,7 @@ msgstr ""
"ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο. (λόγω χαμένου αÏχείου)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2828,7 +2816,7 @@ msgstr ""
"ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2836,7 +2824,7 @@ msgstr ""
"ΚατεστÏαμμένα αÏχεία ευÏετηÏίου πακέτων. Δεν υπάÏχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2969,78 +2957,101 @@ msgstr "Εγιναν %i εγγÏαφές με %i ασÏμβατα αÏχεία.\
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγÏαφές με %i απώντα αÏχεία και %i ασÏμβατα αÏχεία\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Άνοιγμα του αÏχείου Ïυθμίσεων %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Ανόμοιο MD5Sum"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Εγκατάσταση του %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "ΡÏθμιση του %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "ΑφαιÏÏŽ το %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Το %s διαγÏάφηκε πλήÏως"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Εκτέλεση του post-installation trigger %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Ο φάκελος %s αγνοείται."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "ΠÏοετοιμασία του %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "ΞεπακετάÏισμα του %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "ΠÏοετοιμασία ÏÏθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Έγινε εγκατάσταση του %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "ΠÏοετοιμασία για την αφαίÏεση του %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "ΑφαίÏεσα το %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "ΠÏοετοιμασία πλήÏης αφαίÏεσης του %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Το %s διαγÏάφηκε πλήÏως"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Αδυναμία εγγÏαφής στο αÏχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
"Ï€ÏοσαÏτημένο το /dev/pts;)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3066,26 +3077,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "ΑδÏνατη η διόÏθωση του αÏχείου"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Η σÏνδεση έκλεισε Ï€ÏόωÏα"
-#~ msgid "Could not patch file"
-#~ msgstr "ΑδÏνατη η διόÏθωση του αÏχείου"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 4ee752427..3b73e344b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-13 11:47+0000\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -144,14 +144,9 @@ msgstr " Package pin: "
msgid " Version table:"
msgstr " Version table:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s compiled on %s %s\n"
@@ -647,7 +642,7 @@ msgstr "Failed to rename %s to %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
@@ -808,11 +803,11 @@ msgstr "Packages need to be removed but remove is disabled."
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -841,8 +836,8 @@ msgstr "After this operation, %sB of additional disk space will be used.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "After this operation, %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -879,7 +874,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -888,7 +883,7 @@ msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -986,34 +981,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Selected version %s (%s) for %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Couldn't stat source package list %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1021,18 +1016,18 @@ msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' to remove them."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1050,43 +1045,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internal Error, AutoRemoved broke stuff"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Couldn't find task %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s set to manually installed.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run 'apt-get -f install' to correct these:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1089,7 @@ msgstr ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1106,116 +1101,116 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Must specify at least one package for which you want to check builddeps"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1219,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,31 +1228,31 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1342,7 +1337,7 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1591,7 +1586,7 @@ msgstr "File %s/%s overwrites the one in the package %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1758,11 +1753,11 @@ msgid "File not found"
msgstr "File not found"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
@@ -1771,34 +1766,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Invalid URI, local URIS must not start with //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Logging in"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Unable to determine the peer name"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Unable to determine the local name"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "The server refused the connection and said: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER failed, server said: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS failed, server said: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1806,114 +1801,114 @@ msgstr ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Login script command ‘%s’ failed, server said: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE failed, server said: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Connection timeout"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Server closed the connection"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Read error"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "A response overflowed the buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protocol corruption"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Write error"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Could not create a socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Could not connect data socket, connection timed out"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Could not connect, passive socket."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo was unable to get a listening socket"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Could not bind a socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Could not listen on the socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Could not determine the name of the socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Unable to send PORT command"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Unknown address family %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT failed, server said: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Data socket connect timed out"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Unable to fetch file, server said ‘%s’"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Data socket timed out"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Data transfer failed, server said ‘%s’"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Query"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Unable to invoke"
@@ -2024,80 +2019,80 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Failed to truncate file"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Internal error"
@@ -2105,25 +2100,18 @@ msgstr "Internal error"
msgid "Can't mmap an empty file"
msgstr "Cannot mmap an empty file"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Couldn't make mmap of %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2509,14 +2497,14 @@ msgstr "Type ‘%s’ is not known on line %u in source list %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Malformed line %u in source list %s (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2527,7 +2515,7 @@ msgstr ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2604,12 +2592,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Packaging system ‘%s’ is not supported"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Unable to determine a suitable packaging system type"
@@ -2742,19 +2730,19 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash Sum mismatch"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2763,7 +2751,7 @@ msgstr ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2772,14 +2760,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2912,76 +2900,99 @@ msgstr "Wrote %i records with %i mismatched files\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Opening configuration file %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum mismatch"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installing %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configuring %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Removing %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Completely removed %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Running post-installation trigger %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory '%s' missing."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Installed %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparing for removal of %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparing to completely remove %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Completely removed %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3007,26 +3018,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Could not patch file"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connection closed prematurely"
-#~ msgid "Could not patch file"
-#~ msgstr "Could not patch file"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/es.po b/po/es.po
index 9111e88a7..de7730b05 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-15 21:52+0100\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -148,14 +148,9 @@ msgstr " Pin del paquete: "
msgid " Version table:"
msgstr " Tabla de versión:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado en %s %s\n"
@@ -662,7 +657,7 @@ msgstr "Falló el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
@@ -823,11 +818,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no terminó el ordenamiento"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -859,8 +854,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Se liberarán %sB después de esta operación.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -897,7 +892,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -906,7 +901,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de sólo descarga"
@@ -1004,35 +999,35 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Versión seleccionada %s (%s) para %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "No se puede leer la lista de paquetes fuente %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "El comando de actualización no toma argumentos"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1040,18 +1035,18 @@ msgstr ""
"Se instalaron de forma automática los siguientes paquetes y ya no son "
"necesarios."
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Se instalaron de forma automática los siguientes paquetes y ya no son "
"necesarios."
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Utilice «apt-get autoremove» para eliminarlos."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1069,43 +1064,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente información puede ayudar a resolver la situación:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error interno, «AutoRemover» rompió cosas"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompió cosas"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "No se pudo encontrar la tarea %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1113,7 +1108,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solución)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1125,119 +1120,119 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Se instalarán los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Falló"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solución de problemas rompió\n"
"algunas cosas"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su código fuente"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando fichero ya descargado '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orden de construcción '%s'.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Falló el proceso hijo"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construcción"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener información de dependencias de construcción para %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcción.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1246,7 +1241,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1255,32 +1250,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
"disponible del paquete %s satisface los requisitos de versión"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1366,7 +1361,7 @@ msgstr ""
"para más información y opciones.\n"
" Este APT tiene poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1621,7 +1616,7 @@ msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1789,11 +1784,11 @@ msgid "File not found"
msgstr "Fichero no encontrado"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificación"
@@ -1802,34 +1797,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI inválido, los URIS locales no deben de empezar con //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Entrando"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "No pude determinar el nombre del par"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Imposible determinar el nombre local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "El servidor rechazó nuestra conexión y dijo: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Usuario (USER) falló, el servidor dijo: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Clave (PASS) falló, el servidor dijo: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1837,114 +1832,114 @@ msgstr ""
"Se especificó un servidor proxy pero no un script de entrada,\n"
"Acquire::ftp::ProxyLogin está vacío."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Falló la orden '%s' del script de entrada, el servidor dijo: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Tipo (TYPE) falló, el servidor dijo: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "La conexión expiró"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "El servidor cerró la conexión"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Error de lectura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Una respuesta desbordó el buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Corrupción del protocolo"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Error de escritura"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "No pude crear un socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "No pude conectar un socket pasivo."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo no pude obtener un socket oyente"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "No pude ligar un socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "No pude escuchar en el socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "No pude determinar el nombre del socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "No pude mandar la orden PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Dirección de familia %u desconocida (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT falló, el servidor dijo: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Expiró conexión a socket de datos"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexión"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Imposible traer archivo, el servidor dijo '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Expiró el socket de datos"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Falló transferencia de datos, el servidor dijo '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "No pude invocar "
@@ -2057,80 +2052,80 @@ msgstr "No pude abrir una tubería para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Mala línea de cabecera"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envió una cabecera de respuesta inválida"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envió una cabecera de Content-Length inválida"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envió una cabecera de Content-Range inválida"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Éste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Falló la selección"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Expiró la conexión"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Falló al truncar el archivo"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Fallo la conexión"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Error interno"
@@ -2138,25 +2133,18 @@ msgstr "Error interno"
msgid "Can't mmap an empty file"
msgstr "No puedo hacer mmap de un fichero vacío"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "No pude hacer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2546,14 +2534,14 @@ msgstr "Tipo '%s' desconocido en la línea %u de lista de fuentes %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2565,7 +2553,7 @@ msgstr ""
"Esto generalmente es malo, pero si realmente quiere hacerlo, active \n"
"la opción APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2644,12 +2632,12 @@ msgstr "El método %s no se inició correctamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema de paquetes '%s' no está soportado"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -2791,21 +2779,21 @@ msgstr "Error de E/S guardando caché fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "falló el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pública disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2815,7 +2803,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2824,7 +2812,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2832,7 +2820,7 @@ msgstr ""
"Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "El tamaño difiere"
@@ -2969,78 +2957,101 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Abriendo fichero de configuración %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "La suma hash difiere"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Se borró completamente %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Ejecutando disparador post-instalación %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta el directorio '%s'."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparándose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose para eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s eliminado"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose para eliminar completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Se borró completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No se pudo escbribir en el registro, falló la llamada a «openpty()» (¿está "
"montado /dev/pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3066,26 +3077,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "No pude parchear el fichero"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La conexión se cerró prematuramente"
-#~ msgid "Could not patch file"
-#~ msgstr "No pude parchear el fichero"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/eu.po b/po/eu.po
index c899df2b2..79627a72e 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: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -148,14 +148,9 @@ msgstr " Paketearen pin-a:"
msgid " Version table:"
msgstr " Bertsio taula:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
@@ -650,7 +645,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -811,11 +806,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga direktorioa blokeatu"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Ezin izan da Iturburu zerrenda irakurri."
@@ -846,8 +841,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -884,7 +879,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -893,7 +888,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -991,34 +986,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda direktorioa blokeatu"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1026,18 +1021,18 @@ msgstr ""
"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
"behar."
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
"behar."
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "'apt-get autoremove' erabili ezabatzeko."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1055,43 +1050,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Ezin izan da %s zeregina aurkitu"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1099,7 +1094,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1111,117 +1106,117 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturburua\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze mendekotasunik.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1224,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1238,32 +1233,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1348,7 +1343,7 @@ msgstr ""
"sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
" APT honek Super Behiaren Ahalmenak ditu.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1598,7 +1593,7 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1767,11 +1762,11 @@ msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -1780,34 +1775,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Sartzen"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Ezin izan da peer edo parekoaren izena zehaztu"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Ezin izan da izen lokala zehaztu"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1815,117 +1810,117 @@ msgstr ""
"Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::"
"ProxyLogin hutsik dago."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan "
"du: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Konexioa denboraz kanpo"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Zerbitzariak konexioa itxi du"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Irakurketa errorea"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Erantzun batek bufferrari gainez eragin dio."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokolo hondatzea"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Idazketa errorea"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Ezin izan da socket-a sortu"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
"Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Ezin izan da socket pasibora konektatu."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Ezin izan da socket bat lotu"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Ezin izan da socket-ean entzun"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Ezin izan da socket-aren izena zehaztu"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Ezin da PORT komandoa bidali"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Helbide familia ezezagunaa: %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Datu-socket konexioak denbora muga gainditu du"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Datu-socketak denbora muga gainditu du"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Kontsulta"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Ezin da deitu "
@@ -2036,80 +2031,80 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Datu formatu ezezaguna"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Konexioaren denbora muga gainditu da"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Huts fitxategia mozterakoan"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Barne errorea"
@@ -2117,12 +2112,12 @@ msgstr "Barne errorea"
msgid "Can't mmap an empty file"
msgstr "Ezin da fitxategi huts baten mmap egin"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ezin izan da %lu byteren mmap egin"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2131,13 +2126,6 @@ msgstr ""
"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
"balioa: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2527,14 +2515,14 @@ msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2546,7 +2534,7 @@ msgstr ""
"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
"aukera."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2622,12 +2610,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' pakete sistema ez da onartzen"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
@@ -2760,19 +2748,19 @@ msgstr "S/I errorea iturburu katxea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2781,7 +2769,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2790,7 +2778,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2798,7 +2786,7 @@ msgstr ""
"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2932,78 +2920,101 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "%s konfigurazio fitxategia irekitzen"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Egiaztapena ez dator bat"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "%s Instalatzen"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s konfiguratzen"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s kentzen"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s guztiz ezabatu da"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "'%s' direktorioa falta da"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s irekitzen"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfiguratzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s Instalatuta"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s kentzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s kendurik"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s guztiz ezabatzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
"muntaturik?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3029,26 +3040,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
-#~ msgid "Could not patch file"
-#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/fi.po b/po/fi.po
index a67aa2b7e..06faec09a 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: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -146,14 +146,9 @@ msgstr " Paketin tunnistenumero: "
msgid " Version table:"
msgstr " Versiotaulukko:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
@@ -651,7 +646,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -812,11 +807,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -846,8 +841,8 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -885,7 +880,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -894,7 +889,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -992,35 +987,35 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1028,18 +1023,18 @@ msgstr ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Poista ne komennolla \"apt-get autoremove\"."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1057,43 +1052,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Tehtävää %s ei löytynyt"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1101,7 +1096,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1112,116 +1107,116 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1224,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1238,32 +1233,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1347,7 +1342,7 @@ msgstr ""
"lisätietoja ja lisää valitsimia.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1598,7 +1593,7 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1767,11 +1762,11 @@ msgid "File not found"
msgstr "Tiedostoa ei löydy"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -1780,34 +1775,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Kirjaudutaan sisään"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Vastapään nimeä ei saa selville"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Paikallista nimeä ei saa selville"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER ei onnistunut, palvelimen ilmoitus: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1815,114 +1810,114 @@ msgstr ""
"Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::"
"ftp::ProxyLogin on tyhjä."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE ei toiminut, palvelin ilmoitti: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Yhteys aikakatkaistiin"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Palvelin sulki yhteyden"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Lukuvirhe"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Vastaus aiheutti puskurin ylivuodon."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Yhteyskäytäntö on turmeltunut"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Virhe kirjoitettaessa"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Pistoketta ei voitu luoda"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Passiivista pistoketta ei voitu kytkeä."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo ei saanut kuuntelupistoketta"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Pistoketta ei voitu nimetä"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Pistoketta ei voitu kuunnella"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Pistokkeen nimeä ei saatu selville"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Komennon PORT lähetys ei onnistu"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Tuntematon osoiteperhe %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Pistokkeen kytkeminen aikakatkaistiin"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Pistoke aikakatkaistiin"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Kysely"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Käynnistys ei onnistu"
@@ -2035,80 +2030,80 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Tiedoston typistäminen ei onnistunut"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2116,25 +2111,18 @@ msgstr "Sisäinen virhe"
msgid "Can't mmap an empty file"
msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ei voitu tehdä %lu tavun mmap:ia"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2520,14 +2508,14 @@ msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2538,7 +2526,7 @@ msgstr ""
"s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta "
"jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2613,12 +2601,12 @@ msgstr "Menetelmä %s ei käynnistynyt oikein"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2753,19 +2741,19 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash Sum täsmää"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2774,7 +2762,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2783,7 +2771,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2791,7 +2779,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Koko ei täsmää"
@@ -2926,78 +2914,101 @@ msgstr ""
"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
"tiedostoa\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Avataan asetustiedosto %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum täsmää"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Asennetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Tehdään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Poistetaan %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s poistettiin kokonaan"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Suoritetaan jälkiasennusliipaisin %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Kansio \"%s\" puuttuu."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Valmistellaan %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Puretaan %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Valmistaudutaan tekemään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s asennettu"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Valmistaudutaan poistamaan %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s poistettu"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Valmistaudutaan poistamaan %s kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
"liittämättä?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3023,26 +3034,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Tiedostoa %s ei voitu avata"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Yhteys katkesi ennenaikaisesti"
-#~ msgid "Could not patch file"
-#~ msgstr "Tiedostoa %s ei voitu avata"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/fr.po b/po/fr.po
index 4742421ca..3b5bb2837 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,13 +3,13 @@
# French messages
#
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-09-27 19:36+0200\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"PO-Revision-Date: 2010-01-29 19:53+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -147,14 +147,9 @@ msgstr " Étiquette de paquet : "
msgid " Version table:"
msgstr " Table de version :"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pour %s compilé sur %s %s\n"
@@ -313,7 +308,7 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'écrire sur %s"
@@ -451,7 +446,7 @@ msgstr "Base de données ancienne, tentative de mise à jour de %s\""
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Le format de la base de données n'est pas valable. Si vous mettez APT à "
@@ -468,11 +463,11 @@ msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
msgid "Failed to stat %s"
msgstr "Impossible de statuer %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "L'archive n'a pas d'enregistrement de contrôle"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
@@ -537,26 +532,26 @@ msgstr "*** Impossible de lier %s à %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, 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:641
+#: ftparchive/writer.cc:642
#, 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"
@@ -660,7 +655,7 @@ msgstr "Impossible de changer le nom %s en %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -823,11 +818,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a été interrompu."
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut être lue."
@@ -859,8 +854,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de déterminer l'espace disponible sur %s"
@@ -901,7 +896,7 @@ msgstr "Annulation."
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n] ? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
@@ -910,7 +905,7 @@ msgstr "Impossible de récupérer %s %s\n"
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu être téléchargés."
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
@@ -1010,37 +1005,38 @@ msgstr "La version « %s » de « %s » n'a pu être trouvée"
msgid "Selected version %s (%s) for %s\n"
msgstr "Version choisie %s (%s) pour %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
+"La distribution cible « %s » indisponible pour le paquet « %s » est ignorée"
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1352
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Impossible de localiser la liste des paquets sources %s"
+msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
-#: cmdline/apt-get.cc:1383
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "La commande de mise à jour ne prend pas d'argument"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossible de verrouiller le répertoire de liste"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Aucune suppression n'est sensée se produire : impossible de lancer "
"« Autoremover »"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1048,17 +1044,17 @@ msgstr ""
"Les paquets suivants ont été installés automatiquement et ne sont plus "
"nécessaires :"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1077,44 +1073,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "L'information suivante devrait vous aider à résoudre la situation : "
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Impossible de trouver la tâche %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s passé en « installé manuellement ».\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1122,7 +1118,7 @@ msgstr ""
"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1134,119 +1130,119 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"été créés ou ne sont pas sortis d'Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Paquets défectueux"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplémentaires suivants seront installés : "
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Paquets suggérés :"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Paquets recommandés :"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Échec"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de résolution du problème a cassé certaines "
"parties"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nécessité de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Nécessité de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
"construction"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dépendances de construction pour %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1255,7 +1251,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
"peut être trouvé"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1264,33 +1260,33 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
"du paquet %s ne peut satisfaire à la version requise"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
"est trop récent"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1375,7 +1371,7 @@ msgstr ""
"apt.conf(5) pour plus d'informations et d'option.\n"
" Cet APT a les « Super Cow Powers »\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1630,11 +1626,10 @@ msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
@@ -1666,9 +1661,9 @@ msgstr ""
"fichiers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Lecture des listes de paquets"
@@ -1819,34 +1814,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Connexion en cours"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Impossible de déterminer le nom de la machine distante"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Impossible de déterminer le nom local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Le serveur a refusé notre connexion et a répondu : %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER incorrect, le serveur a répondu : %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS incorrect, le serveur a répondu : %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1854,116 +1849,116 @@ msgstr ""
"Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::"
"ftp::ProxyLogin est vide."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Échec de TYPE, le serveur a répondu : %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Dépassement du délai de connexion"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Le serveur a fermé la connexion"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Erreur de lecture"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Une réponse a fait déborder le tampon."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Corruption du protocole"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Erreur d'écriture"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Impossible de créer un connecteur"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossible de se connecter sur le port de données, délai de connexion dépassé"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Impossible de se connecter au port en mode passif."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Impossible de se connecter à un port"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Impossible d'écouter sur le port"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Impossible de déterminer le nom du port"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Impossible d'envoyer la commande PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Famille d'adresses %u inconnue (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT a échoué, le serveur a répondu : %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Délai de connexion au port de données dépassé"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problème de hachage du fichier"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Pas de réponse du port données dans les délais"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Requête"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Impossible d'invoquer "
@@ -2004,65 +1999,70 @@ msgstr "Connexion à %s: %s (%s) impossible."
msgid "Connecting to %s"
msgstr "Connexion à %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ne parvient pas à résoudre « %s »"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Erreur temporaire de résolution de « %s »"
-#: methods/connect.cc:193
-#, fuzzy, c-format
+#: methods/connect.cc:194
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%"
-"s » (%i)"
+"s » (%i - %s)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossible de se connecter à %s:%s :"
-#: methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Impossible d'accéder au porte-clés : « %s »"
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr "E: trop de porte-clés devraient être passés à gpgv. Abandon."
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
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:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Au moins une signature non valable a été rencontrée."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Impossible d'exécuter « %s » pour contrôler la signature\n"
"(veuillez vérifier si gpgv est installé)."
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Erreur inconnue à l'exécution de gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Les signatures suivantes ne sont pas valables :\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2080,80 +2080,80 @@ msgstr "Ne parvient pas à ouvrir le tube pour %s"
msgid "Read error from %s process"
msgstr "Erreur de lecture du processus %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tête"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tête"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possède un support des limites non-valide"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:788
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Sélection défaillante"
-#: methods/http.cc:793
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Délai de connexion dépassé"
-#: methods/http.cc:816
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Erreur d'écriture du fichier de sortie"
-#: methods/http.cc:847
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Erreur d'écriture sur un fichier"
-#: methods/http.cc:875
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Erreur d'écriture sur le fichier"
-#: methods/http.cc:889
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
-#: methods/http.cc:891
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Échec de la troncature du fichier"
-#: methods/http.cc:1147
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Mauvais en-tête de donnée"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Échec de la connexion"
-#: methods/http.cc:1311
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Erreur interne"
@@ -2182,6 +2182,8 @@ msgid ""
"The size of a MMap has already reached the defined limit of %lu bytes,abort "
"the try to grow the MMap."
msgstr ""
+"La taille d'une « MMap » (carte en mémoire) a déjà atteint la limite définie "
+"de %lu octets. Abandon de la tentative d'agrandir la « MMap »."
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
@@ -2212,54 +2214,54 @@ msgstr "%lis"
msgid "Selection %s not found"
msgstr "La sélection %s n'a pu être trouvée"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Type d'abréviation non reconnue : « %c »"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Ouverture du fichier de configuration %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erreur syntaxique %s:%u : balise mal formée"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
"niveau le plus haut"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
@@ -2335,75 +2337,75 @@ msgstr "Impossible d'accéder à %s"
msgid "Failed to stat the cdrom"
msgstr "Impossible d'accéder au cédérom."
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Impossible d'ouvrir le fichier verrou %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Impossible de verrouiller %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Le sous-processus %s a reçu le signal %u"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, 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:464
+#: apt-pkg/contrib/fileutl.cc:588
#, 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:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Impossible de verrouiller %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problème de fermeture du fichier"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problème d'effacement du fichier"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problème de synchronisation du fichier"
@@ -2520,67 +2522,70 @@ msgstr "Impossible de traiter le fichier %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossible de traiter le fichier %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Ouverture de %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Impossible d'effectuer la configuration immédiate de « %s ». Veuillez "
+"consulter la page de manuel apt.conf(5) et notamment la section à propos de "
+"APT::Immediate-Configure, pour plus d'informations. (%d)"
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2592,12 +2597,15 @@ msgstr ""
"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
"le faire, activez l'option APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"Impossible d'effectuer la configuration immédiate du paquet « %s », déjà "
+"décompressé. Veuillez consulter la page de manuel apt.conf(5) et notamment "
+"la section à propos de APT::Immediate-Configure, pour plus d'informations."
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2673,12 +2681,12 @@ msgstr ""
"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
"touche Entrée."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Le système de paquet « %s » n'est pas supporté"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossible de déterminer un type du système de paquets adéquat"
@@ -2702,19 +2710,19 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
"« Package »."
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Étiquette %s inconnue"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
@@ -2808,16 +2816,16 @@ msgstr ""
"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
"fichiers"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossible de localiser la liste des paquets sources %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Assemblage des fichiers listés dans les champs Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
@@ -2827,20 +2835,20 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Somme de contrôle MD5 incohérente"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Somme de contrôle de hachage incohérente"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2849,7 +2857,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:1283
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2858,7 +2866,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:1324
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2866,7 +2874,7 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Taille incohérente"
@@ -3003,78 +3011,98 @@ msgstr ""
"%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
"correspondent pas\n"
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Fichier %s inexistant ignoré"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Somme de contrôle de hachage incohérente pour %s"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installation de %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr "Suppression complète de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr "Exécution des actions différées (« trigger ») de %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Répertoire %s inexistant"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Préparation de %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Décompression de %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Préparation de la configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s installé"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Préparation de la suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s supprimé"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Préparation de la suppression complète de %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s complètement supprimé"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossible d'écrire le journal, échec d'openpty()\n"
"(/dev/pts est-il monté ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr "Exécution de dpkg"
@@ -3112,6 +3140,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Impossible de modifier %s avec mmap et l'utilisation des opérations de "
+"fichiers : le correctif semble être corrompu."
#: methods/rred.cc:470
#, c-format
@@ -3119,17 +3149,25 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
+"correctif semble être corrompu."
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connexion fermée prématurément"
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Impossible d'accéder au porte-clés : « %s »"
#~ msgid "Could not patch file"
#~ msgstr "Impossible de corriger le fichier"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/gl.po b/po/gl.po
index 656e696c5..c382d3ae9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-12-17 22:44+0100\n"
"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -149,14 +149,9 @@ msgstr " Inmobilizado: "
msgid " Version table:"
msgstr " Táboa de versións:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado o %s %s\n"
@@ -662,7 +657,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro na compilación da expresión regular - %s"
@@ -823,11 +818,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
@@ -857,8 +852,8 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Despois desta operación hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non se puido determinar o espazo libre en %s"
@@ -895,7 +890,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non se puido obter %s %s\n"
@@ -904,7 +899,7 @@ msgstr "Non se puido obter %s %s\n"
msgid "Some files failed to download"
msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -1004,53 +999,53 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Escolleuse a versión %s (%s) de %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Non se atopou a lista de paquetes fonte %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "A orde \"update\" non toma argumentos"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Non se puido bloquear o directorio de listas"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non se supón que se deban eliminar cousas; non se pode iniciar o "
"autoeliminador"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Empregue \"apt-get autoremove\" para eliminalos."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1068,43 +1063,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte información pode axudar a resolver a situación:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro interno, o autoeliminador rompeu cousas"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Non se puido atopar a tarefa %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s cambiouse a instalado manualmente.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1112,7 +1107,7 @@ msgstr ""
"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
"especifique unha solución)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1123,118 +1118,118 @@ msgstr ""
"unha situación imposible ou, se emprega a distribución inestable, que\n"
"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Rematado"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1243,7 +1238,7 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
"o paquete %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1252,32 +1247,32 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
"novo de máis"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1365,7 +1360,7 @@ msgstr ""
"máis información e opcións.\n"
" Este APT ten Poderes de Supervaca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1615,7 +1610,7 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1783,11 +1778,11 @@ msgid "File not found"
msgstr "Non se atopou o ficheiro"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Non se atopou"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Non se puido estabrecer a hora de modificación"
@@ -1796,34 +1791,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI non válido, os URIs locais non deben comezar por //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "A se identificar"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Non se puido determinar o nome do outro extremo"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Non se puido determinar o nome local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "O servidor rexeitou a conexión e dixo: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "A orde USER fallou, o servidor dixo: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "A orde PASS fallou, o servidor dixo: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1831,115 +1826,115 @@ msgstr ""
"Especificouse un servidor proxy pero non un script de conexión, Acquire::"
"ftp::ProxyLogin está baleiro."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "A orde do script de conexión \"%s\" fallou, o servidor dixo: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "A orde TYPE fallou, o servidor dixo: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Tempo esgotado para a conexión"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "O servidor pechou a conexión"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Erro de lectura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Unha resposta desbordou o buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Corrupción do protocolo"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Erro de escritura"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Non se puido crear un socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
"Non se puido conectar o socket de datos, o tempo esgotouse para a conexión"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Non se puido conectar o socket pasivo."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo non puido obter un socket para escoitar"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Non se puido ligar un socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Non se puido escoitar no socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Non se puido determinar o nome do socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Non se puido enviar a orde PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Familia de enderezos %u (AF_*) descoñecida"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "A orde EPRT fallou, o servidor dixo: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "A conexión do socket de datos esgotou o tempo"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Non se pode aceptar a conexión"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Non se pode obter o ficheiro, o servidor dixo \"%s\""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "O socket de datos esgotou o tempo"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "A transferencia de datos fallou, o servidor dixo \"%s\""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Petición"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Non se puido chamar a "
@@ -2054,80 +2049,80 @@ msgstr "Non se puido abrir unha canle para %s"
msgid "Read error from %s process"
msgstr "Erro de lectura do proceso %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "A agardar polas cabeceiras"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Liña de cabeceira incorrecta"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP ten un soporte de rangos roto"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formato de data descoñecido"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Erro ao escribir no ficheiro de saída"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Erro ao escribir nun ficheiro"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Erro ao escribir no ficheiro"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Non se puido truncar o ficheiro"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "A conexión fallou"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Erro interno"
@@ -2135,25 +2130,18 @@ msgstr "Erro interno"
msgid "Can't mmap an empty file"
msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Non se puido facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2540,14 +2528,14 @@ msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2558,7 +2546,7 @@ msgstr ""
"%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, "
"pero se o quere facer, active a opción APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2634,12 +2622,12 @@ msgstr "O método %s non se iniciou correctamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "O sistema de empaquetamento \"%s\" non está soportado"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
@@ -2776,20 +2764,20 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Os \"hashes\" non coinciden"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2798,7 +2786,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2807,7 +2795,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2815,7 +2803,7 @@ msgstr ""
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
@@ -2950,78 +2938,101 @@ msgstr ""
"Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non "
"coinciden\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "A abrir o ficheiro de configuración %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Os \"hashes\" non coinciden"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "A instalar %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "A eliminar %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Eliminouse %s completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "A executar o disparador de post-instalación %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "O directorio \"%s\" falla"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "A desempaquetar %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "A se preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Instalouse %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "A se preparar para a eliminación de %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Eliminouse %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A se preparar para eliminar %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Eliminouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
"non estaba montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3047,26 +3058,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Non se puido parchear o ficheiro"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "A conexión pechouse prematuramente"
-#~ msgid "Could not patch file"
-#~ msgstr "Non se puido parchear o ficheiro"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/he.po b/po/he.po
index e7497ca4f..a5cfcf6a8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 11:38+0200\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -144,14 +144,9 @@ msgstr "נעץ חבילה:"
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
@@ -196,7 +191,7 @@ msgid ""
msgstr ""
#: cmdline/apt-cdrom.cc:77
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
#: cmdline/apt-cdrom.cc:92
@@ -426,26 +421,26 @@ msgstr "*** כשלון בקישור %s ל-%s"
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "המתחזק של %s ×”×•× %s ×•×œ× %s\n"
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -549,7 +544,7 @@ msgstr "כשלון בשינוי ×”×©× %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -696,7 +691,7 @@ msgstr ""
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
msgid "There are problems and -y was used without --force-yes"
msgstr "היו בעיות וה×פשרות -y היתה בשימוש ×œ×œ× ×”×פשרות --force-yes"
@@ -712,11 +707,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "×œ× ×ž×¦×œ×™×— לנעול ×ת ספרית ההורדה."
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "רשימת המקורות ×œ× × ×™×ª× ×ª לקרי××”."
@@ -745,25 +740,26 @@ msgstr "×חרי פריסה %sB × ×•×¡×¤×™× ×™×”×™×• בשימוש.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "×חרי פריסה %sB × ×•×¡×¤×™× ×™×©×•×—×¨×¨×•.\n"
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "×ין לך מספיק ×ž×§×•× ×¤× ×•×™ ב-%s."
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
#, c-format
msgid "You don't have enough free space in %s."
msgstr "×ין לך מספיק ×ž×§×•× ×¤× ×•×™ ב-%s."
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
msgid "Yes, do as I say!"
msgstr "כן, עשה כפי ש×× ×™ ×ומר!"
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -771,75 +767,75 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
msgid "Abort."
msgstr "בטל."
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "×”×× ×תה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהב×ת %s %s\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצי×"
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -847,74 +843,85 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1313
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1342
#, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "החבילות החדשות הב×ות הולכות להיות מותקנות:"
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "החבילות החדשות הב×ות הולכות להיות מותקנות:"
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -930,50 +937,50 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "שגי××” פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "×בל %s הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -981,153 +988,153 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגי××” פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1171,7 +1178,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1245,11 +1252,11 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr ""
#: dselect/install:101
-msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr ""
#: dselect/install:102
-msgid "packages that were installed. This may result in duplicate errors"
+msgid "will be configured. This may result in duplicate errors"
msgstr ""
#: dselect/install:103
@@ -1404,7 +1411,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1580,147 +1587,147 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1773,13 +1780,14 @@ msgstr ""
#: methods/connect.cc:193
#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
#: methods/connect.cc:240
-#, c-format
-msgid "Unable to connect to %s %s:"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Unable to write to %s"
+msgid "Unable to connect to %s:%s:"
+msgstr "×œ× ×ž×¦×œ×™×— לכתוב ל-%s"
#: methods/gpgv.cc:71
#, c-format
@@ -1829,81 +1837,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:787
+#: methods/http.cc:790
msgid "Select failed"
msgstr ""
-#: methods/http.cc:792
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:815
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:846
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:874
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:888
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:890
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "כשלון בפענוח %s"
-#: methods/http.cc:1146
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1310
+#: methods/http.cc:1313
msgid "Internal error"
msgstr ""
@@ -2308,7 +2316,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2316,6 +2331,13 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
+#: apt-pkg/packagemanager.cc:478
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
@@ -2380,12 +2402,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2677,76 +2699,96 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr ""
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "מותקן:"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, fuzzy, c-format
msgid "Installed %s"
msgstr "מותקן:"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2780,6 +2822,9 @@ msgstr ""
msgid "Connection closed prematurely"
msgstr ""
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/hu.po b/po/hu.po
index 9bd8920b5..54a8814fe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-05-11 14:49+0100\n"
"Last-Translator: SZERVÃC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -149,14 +149,9 @@ msgstr " Csomag Tű: "
msgid " Version table:"
msgstr " Verziótáblázat:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
@@ -655,7 +650,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -816,11 +811,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba, a rendezés nem zárult"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -849,8 +844,8 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely itt: %s"
@@ -887,7 +882,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -896,7 +891,7 @@ msgstr "Sikertelen letöltés: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -993,49 +988,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Töröld az 'apt-get autoremove' paranccsal!"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1053,43 +1048,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Belső hiba, az AutoRemover sérült"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Hiányzó %s feladat"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s kézi telepítésre állított.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1097,7 +1092,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1109,118 +1104,118 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött '%s' fájl kihagyása\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1224,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1238,32 +1233,32 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1348,7 +1343,7 @@ msgstr ""
"további információkért és opciókért.\n"
" Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1596,7 +1591,7 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1763,11 +1758,11 @@ msgid "File not found"
msgstr "Nem találom a fájlt"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "A módosítási időt beállítása sikertelen"
@@ -1776,34 +1771,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Érvénytelen URI, helyi URIk nem kezdődhetnek //-el"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Bejelentkezés a kiszolgálóra:"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nem lehet a társ nevét megállapítani"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nem lehet a helyi nevet megállapítani"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "A kiszolgáló megtagadta a kapcsolatot: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Hibás USER, a kiszolgáló üzenete: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Hibás PASS, a kiszolgáló üzenete: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1811,114 +1806,114 @@ msgstr ""
"Egy proxy kiszolgáló meg lett adva login szkript nélkül, és az Acquire::ftp::"
"ProxyLogin üres."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló üzenete: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Hibás TYPE, a kiszolgáló üzenete: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "A kiszolgáló lezárta a kapcsolatot"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Olvasási hiba"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "A válasz túlcsordította a puffert."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokoll hiba"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Ãrási hiba"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nem lehet létrehozni a socket-et"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időt"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nem lehet kapcsolódni a passzív sockethez."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "A getaddrinfo nem talált figyelő socketet"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nem lehet összekapcsolódni a sockettel"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Nem lehet figyelni a socketen"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Nem lehet megállapítani a socket nevét"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Nem lehet PORT parancsot küldeni"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Ismeretlen %u címcsalád (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Az adat sockethez kapcsolódás túllépte az időt"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Az adat socket túllépte az időt"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Adatátvitel sikertelen, a kiszolgáló üzenete: '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Lekérdezés"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nem lehet meghívni "
@@ -2027,81 +2022,81 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba %s folyamattól"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s fájl írása sikertelen"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Belső hiba"
@@ -2110,25 +2105,18 @@ msgstr "Belső hiba"
msgid "Can't mmap an empty file"
msgstr "Nem lehet mmap-olni egy üres fájlt"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nem sikerült %lu bájtot mmap-olni"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2515,14 +2503,14 @@ msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2533,7 +2521,7 @@ msgstr ""
"alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, "
"de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2610,12 +2598,12 @@ msgstr "A(z) %s metódus nem indult el helyesen"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "A(z) '%s' csomagrendszer nem támogatott"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "A megfelelő csomagrendszer típus nem határozható meg"
@@ -2755,19 +2743,19 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2776,7 +2764,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2785,14 +2773,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
@@ -2925,76 +2913,99 @@ msgstr "%i rekord kiírva %i hibásan párosított fájllal\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "%s konfigurációs fájl megnyitása"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "A Hash Sum nem megfelelő"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Telepített %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s konfigurálása"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s eltávolítása"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s teljesen eltávolítva"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Hiányzik ez a könyvtár: %s"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s kicsomagolása"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfigurálásának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Telepített %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Eltávolított %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s teljes eltávolítása előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3020,26 +3031,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "%s fájl foltozása sikertelen"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "A kapcsolat idő előtt lezárult"
-#~ msgid "Could not patch file"
-#~ msgstr "%s fájl foltozása sikertelen"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/it.po b/po/it.po
index bf37c4dc1..fdbb9b46e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,15 +1,15 @@
# Italian translation of apt
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The Free Software Foundation, Inc.
# This file is distributed under the same license as the apt package.
# Samuele Giovanni Tonon <samu@debian.org>, 2002.
#
-# Milo Casagrande <milo@ubuntu.com>, 2009.
+# Milo Casagrande <milo@ubuntu.com>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.23.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-11-11 21:10+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"PO-Revision-Date: 2010-01-29 17:14+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -146,14 +146,9 @@ msgstr " Gancio del pacchetto: "
msgid " Version table:"
msgstr " Tabella versione:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per %s compilato il %s %s\n"
@@ -308,7 +303,7 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
@@ -339,7 +334,7 @@ msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
#: ftparchive/apt-ftparchive.cc:398
#, c-format
msgid "Error processing contents %s"
-msgstr "Errore nell'analisi dei \"contents\" %s"
+msgstr "Errore nell'elaborare i contenuti %s"
#: ftparchive/apt-ftparchive.cc:553
msgid ""
@@ -443,11 +438,11 @@ msgstr "Il database è vecchio, tentativo di aggiornamento %s"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Il formato del database non è valido. Se è stata aggiornata una vecchia "
-"versione di apt, rimuovere e ricreare il database."
+"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
+"una vecchia versione di apt, rimuovere e ricreare il database."
#: ftparchive/cachedb.cc:77
#, c-format
@@ -460,11 +455,11 @@ msgstr "Impossibile aprire il file del database %s: %s"
msgid "Failed to stat %s"
msgstr "Impossibile eseguire stat su %s"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "L'archivio non ha un campo \"control\""
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Impossibile ottenere un cursore"
@@ -510,7 +505,7 @@ msgstr "Apertura di %s non riuscita"
#: ftparchive/writer.cc:254
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " Delink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
#: ftparchive/writer.cc:262
#, c-format
@@ -530,28 +525,28 @@ msgstr "*** Collegamento di %s a %s non riuscito"
#: ftparchive/writer.cc:283
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " Raggiunto il limite di Delink di %sB.\n"
+msgstr " Raggiunto il limite di DeLink di %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -655,7 +650,7 @@ msgstr "Rinomina di %s in %s non riuscita"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -821,11 +816,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non è stato terminato"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Impossibile bloccare la directory di scaricamento"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Impossibile leggere l'elenco dei sorgenti."
@@ -855,8 +850,8 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
@@ -895,7 +890,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
@@ -904,7 +899,7 @@ msgstr "Impossibile recuperare %s %s\n"
msgid "Some files failed to download"
msgstr "Scaricamento di alcuni file non riuscito"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
@@ -965,7 +960,7 @@ msgid ""
"is only available from another source\n"
msgstr ""
"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n"
-"pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n"
+"pacchetto. Questo può significare che il pacchetto è mancante, è obsoleto\n"
"oppure è disponibile solo all'interno di un'altra sorgente\n"
#: cmdline/apt-get.cc:1167
@@ -1004,36 +999,36 @@ msgstr "Version \"%s\" per \"%s\" non trovato"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versione %s (%s) selezionata per %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorato il rilascio non disponibile \"%s\" del pacchetto \"%s\""
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1352
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
+msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
+
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossibile bloccare la directory"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1041,18 +1036,18 @@ msgstr ""
"I seguenti pacchetti sono stati installati automaticamente e non sono più "
"richiesti:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu pacchetti sono stati installati automaticamente e non sono più "
"richiesti.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Usare \"apt-get autoremove\" per rimuoverli."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1070,44 +1065,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Impossibile trovare il task %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare il pacchetto %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "È stato impostato %s per l'installazione manuale.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1110,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
"(o specificare una soluzione)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1127,118 +1122,118 @@ msgstr ""
"usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
"non sono ancora stati creati o sono stati rimossi da Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Pacchetto danneggiato"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti saranno inoltre installati:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Non riuscito"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Eseguito"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s è insufficiente"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario recuperare %sB di sorgenti\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Recupero sorgente %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando \"%s\" di generazione non riuscito.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Creazione processo figlio non riuscita"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui controllare le "
"dipendenze di generazione"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di generazione.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1242,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
"non può essere trovato"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1251,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
"del pacchetto %s può soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
"è troppo nuovo"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1367,7 +1362,7 @@ msgstr ""
"apt-get(8), sources.list(5) e apt.conf(5).\n"
" Questo APT ha i poteri della Super Mucca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1534,7 +1529,7 @@ msgstr "Lettura delle intestazioni dell'archivio non riuscita"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
-msgstr "Dropnode invocata su un nodo ancora collegato"
+msgstr "DropNode invocata su un nodo ancora collegato"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
@@ -1623,11 +1618,10 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
@@ -1657,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Le directory temp e info devono essere sullo stesso file system"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "Lettura elenco dei pacchetti"
@@ -1807,34 +1801,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI non valido, gli URI locali non devono iniziare con //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Accesso in corso"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Impossibile determinare il nome del nodo"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Impossibile determinare il nome locale"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Il server ha rifiutato la connessione e riporta: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER non riuscito, il server riporta: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS non riuscito, il server riporta: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1842,115 +1836,115 @@ msgstr ""
"È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
"ftp::ProxyLogin è vuoto."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE non riuscito, il server riporta: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Connessione scaduta"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Il server ha chiuso la connessione"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Errore di lettura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Una risposta ha superato le dimensioni del buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protocollo danneggiato"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Errore di scrittura"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Impossibile creare un socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Impossibile connettersi al socket dati, connessione terminata"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Impossibile connettere socket passivo."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Impossibile eseguire bind() su un socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Impossibile eseguire listen() su un socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Impossibile determinare il nome del socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Impossibile inviare il comando PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT non riuscito, il server riporta: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Connessione al socket dati terminata"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Si è verificato un problema nel creare l'hash del file"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Socket dati terminato"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Interrogazione"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Impossibile invocare "
@@ -1991,63 +1985,69 @@ msgstr "Impossibile connettersi a %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Connessione a %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Impossibile risolvere \"%s\""
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
-#: methods/connect.cc:193
-#, fuzzy, c-format
+#: methods/connect.cc:194
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i)"
+"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
-#: methods/connect.cc:240
+#: methods/connect.cc:241
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossibile connettersi a %s:%s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Impossibile accedere al portachiavi: \"%s\""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+#| msgid "Aborting install."
+msgid "No keyring installed in %s."
+msgstr "Interruzione dell'installazione."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
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:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "È stata trovata almeno una firma non valida."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Impossibile eseguire \"%s\" per verificare la firma (forse gpgv non è "
"installato)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Le seguenti firme non erano valide:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2065,80 +2065,80 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Ricevuta una singola riga header su %u caratteri"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Riga header non corretta"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un header Content-Length non valido"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un header Content-Range non valido"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha un supporto del range non corretto"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:788
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Select non riuscita"
-#: methods/http.cc:793
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Connessione terminata"
-#: methods/http.cc:816
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Errore nello scrivere sul file di output"
-#: methods/http.cc:847
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Errore nello scrivere su file"
-#: methods/http.cc:875
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Errore nello scrivere sul file"
-#: methods/http.cc:889
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:891
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Errore nel leggere dal server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Troncamento del file non riuscito"
-#: methods/http.cc:1147
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Header dati non corretto"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Connessione non riuscita"
-#: methods/http.cc:1311
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Errore interno"
@@ -2157,7 +2157,7 @@ msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
+"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
"valore attuale è: %lu (man 5 apt.conf)."
#: apt-pkg/contrib/mmap.cc:347
@@ -2196,54 +2196,54 @@ msgstr "%lis"
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Apertura file di configurazione %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Errore di sintassi %s:%u: tag non corretto"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello "
"più alto"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Errore di sintassi %s:%u: incluso da qui"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
@@ -2321,75 +2321,75 @@ msgstr "Impossibile passare a %s"
msgid "Failed to stat the cdrom"
msgstr "Esecuzione di stat sul CD-ROM non riuscita"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Impossibile aprire il file di blocco %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Impossibile impostare il blocco %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, 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:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Il sottoprocesso %s è uscito inaspettatamente"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Impossibile aprire il file %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Si è verificato un problema nel chiudere il file"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Si è verificato un problema nell'eseguire l'unlink del file"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Si è verificato un problema nel sincronizzare il file"
@@ -2507,64 +2507,67 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossibile analizzare il file di pacchetto %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "La riga %lu nel file %s non è corretta (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "La riga %lu nel file %s non è corretta (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "La riga %lu nel file %s non è corretta (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riga %u troppo lunga nel file %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La riga %u nel file %s non è corretta (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La riga %u nel file %s non è corretta (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Impossibile eseguire immediatamente la configurazione su \"%s\".Per maggiori "
+"informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::Immediate-"
+"Configure\" (%d)."
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2576,12 +2579,15 @@ msgstr ""
"situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
"APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"Impossibile eseguire immediatamente la configurazione su \"%s\" già estratto."
+"Per maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
+"Immediate-Configure\"."
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2654,12 +2660,12 @@ msgstr "Il metodo %s non si è avviato correttamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di pacchetti \"%s\" non è supportato"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -2683,19 +2689,19 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"È consigliato eseguire \"apt-get update\" per correggere questi problemi"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
"\""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
-msgstr "Impossibile capire il tipo di gancio %s"
+msgstr "Impossibile comprendere il tipo di gancio %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Priorità per il gancio non specificata (o zero)"
@@ -2783,17 +2789,17 @@ msgstr ""
"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
"dipendenze"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Il file fornisce"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvare la cache sorgente"
@@ -2802,20 +2808,20 @@ msgstr "Errore di I/O nel salvare la cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() non riuscita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "MD5sum non corrispondente"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2824,7 +2830,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:1283
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2833,7 +2839,7 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2841,7 +2847,7 @@ msgstr ""
"L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
@@ -2977,78 +2983,98 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Saltato il file inesistente %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Impossibile trovare il record di autenticazione per %s"
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash non corrispondente per %s"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr "Rimozione completa di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr "Esecuzione comando di post installazione %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory \"%s\" mancante"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Preparazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Estrazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparazione alla configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Pacchetto %s installato"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparazione alla rimozione di %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Pacchetto %s rimosso"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparazione alla rimozione completa di %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
"è montato)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr "Esecuzione di dpkg"
@@ -3086,6 +3112,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Impossibile applicare la patch a %s con mmap e con l'utilizzo di operazioni "
+"file. La patch sembra essere danneggiata."
#: methods/rred.cc:470
#, c-format
@@ -3093,13 +3121,15 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Impossibile applicare la patch a %s con mmap (nessun errore da parte di "
+"mmap). La patch sembra essere danneggiata."
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connessione chiusa prematuramente"
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "Nessun pacchetto sorgente \"%s\", selezionato \"%s\" al suo posto\n"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
-#~ msgid "Could not patch file"
-#~ msgstr "Impossibile applicare la patch al file"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Impossibile accedere al portachiavi: \"%s\""
diff --git a/po/ja.po b/po/ja.po
index e164d8599..bb2e5fddc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-13 09:26+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -145,14 +145,9 @@ msgstr " パッケージ Pin: "
msgid " Version table:"
msgstr " ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ†ãƒ¼ãƒ–ル:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s コンパイル日時: %s %s\n"
@@ -651,7 +646,7 @@ msgstr "%s ã‚’ %s ã«åå‰å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸ"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "æ­£è¦è¡¨ç¾ã®å±•é–‹ã‚¨ãƒ©ãƒ¼ - %s"
@@ -814,11 +809,11 @@ msgstr "パッケージを削除ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ãŒã€å‰Šé™¤ãŒç„¡
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラーã€èª¿æ•´ãŒçµ‚ã‚ã£ã¦ã„ã¾ã›ã‚“"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ソースã®ãƒªã‚¹ãƒˆã‚’読むã“ã¨ãŒã§ãã¾ã›ã‚“。"
@@ -848,8 +843,8 @@ msgstr "ã“ã®æ“作後ã«è¿½åŠ ã§ %sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒæ¶ˆè²»ã•ã‚Œã¾ã
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "ã“ã®æ“作後㫠%sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒè§£æ”¾ã•ã‚Œã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s ã®ç©ºã領域を測定ã§ãã¾ã›ã‚“"
@@ -886,7 +881,7 @@ msgstr "中断ã—ã¾ã—ãŸã€‚"
msgid "Do you want to continue [Y/n]? "
msgstr "続行ã—ã¾ã™ã‹ [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—㟠%s\n"
@@ -895,7 +890,7 @@ msgstr "%s ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—㟠%s\n"
msgid "Some files failed to download"
msgstr "ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードã§ãƒ‘ッケージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ãŒå®Œäº†ã—ã¾ã—ãŸ"
@@ -995,52 +990,52 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s ã«ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1$s (%2$s) ã‚’é¸æŠžã—ã¾ã—ãŸ\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "ソースパッケージリスト %s ã®çŠ¶æ…‹ã‚’å–å¾—ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "update コマンドã¯å¼•æ•°ã‚’ã¨ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "list ディレクトリをロックã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"一連ã®ã‚‚ã®ã‚’削除ã™ã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ãªã„ã®ã§ã€AutoRemover を開始ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"以下ã®ãƒ‘ッケージãŒè‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã—ãŸãŒã€ã‚‚ã†å¿…è¦ã¨ã•ã‚Œã¦ã„ã¾ã›ã‚“:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"以下ã®ãƒ‘ッケージãŒè‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã—ãŸãŒã€ã‚‚ã†å¿…è¦ã¨ã•ã‚Œã¦ã„ã¾ã›ã‚“:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ã“れらを削除ã™ã‚‹ã«ã¯ 'apt-get autoremove' を利用ã—ã¦ãã ã•ã„。"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1058,45 +1053,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "以下ã®æƒ…å ±ãŒã“ã®å•é¡Œã‚’解決ã™ã‚‹ãŸã‚ã«å½¹ç«‹ã¤ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部エラーã€AutoRemover ãŒä½•ã‹ã‚’破壊ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部エラーã€AllUpgrade ãŒä½•ã‹ã‚’破壊ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "タスク %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注æ„: æ­£è¦è¡¨ç¾ '%2$s' ã«å¯¾ã—㦠%1$s ã‚’é¸æŠžã—ã¾ã—ãŸ\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s ã¯æ‰‹å‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ãŸã¨è¨­å®šã•ã‚Œã¾ã—ãŸã€‚\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"以下ã®å•é¡Œã‚’解決ã™ã‚‹ãŸã‚ã« 'apt-get -f install' を実行ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œ"
"ã¾ã›ã‚“:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1099,7 @@ msgstr ""
"未解決ã®ä¾å­˜é–¢ä¿‚ã§ã™ã€‚'apt-get -f install' を実行ã—ã¦ã¿ã¦ãã ã•ã„ (ã¾ãŸã¯è§£æ³•"
"を明示ã—ã¦ãã ã•ã„)。"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1116,118 +1111,118 @@ msgstr ""
"ã§ã‚ã‚Œã°) å¿…è¦ãªãƒ‘ッケージãŒã¾ã ä½œæˆã•ã‚Œã¦ã„ãªã‹ã£ãŸã‚Š Incoming ã‹ã‚‰ç§»\n"
"å‹•ã•ã‚Œã¦ã„ãªã„ã“ã¨ãŒè€ƒãˆã‚‰ã‚Œã¾ã™ã€‚"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "壊れãŸãƒ‘ッケージ"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "以下ã®ç‰¹åˆ¥ãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "æ案パッケージ:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出ã—ã¦ã„ã¾ã™ ... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "完了"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラーã€å•é¡Œãƒªã‚¾ãƒ«ãƒãŒä½•ã‹ã‚’破壊ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースをå–å¾—ã™ã‚‹ã«ã¯å°‘ãªãã¨ã‚‚ã²ã¨ã¤ã®ãƒ‘ッケージåを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s ã®ã‚½ãƒ¼ã‚¹ãƒ‘ッケージãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ã™ã§ã«ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« '%s' をスキップã—ã¾ã™\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s ã«å……分ãªç©ºãスペースãŒã‚ã‚Šã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB ã®ã‚½ãƒ¼ã‚¹ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB ã®ã‚½ãƒ¼ã‚¹ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s ã‚’å–å¾—\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "ã„ãã¤ã‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "ã™ã§ã« %s ã«å±•é–‹ã•ã‚ŒãŸã‚½ãƒ¼ã‚¹ãŒã‚ã‚‹ãŸã‚ã€å±•é–‹ã‚’スキップã—ã¾ã™\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "å­ãƒ—ロセスãŒå¤±æ•—ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルドä¾å­˜é–¢ä¿‚ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ãƒ‘ッケージを少ãªãã¨ã‚‚ 1 ã¤æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s ã®ãƒ“ルドä¾å­˜æƒ…報をå–å¾—ã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ã«ã¯ãƒ“ルドä¾å­˜æƒ…å ±ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1236,7 +1231,7 @@ msgstr ""
"パッケージ %3$s ãŒè¦‹ã¤ã‹ã‚‰ãªã„ãŸã‚ã€%2$s ã«å¯¾ã™ã‚‹ %1$s ã®ä¾å­˜é–¢ä¿‚を満ãŸã™ã“ã¨"
"ãŒã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1245,32 +1240,32 @@ msgstr ""
"入手å¯èƒ½ãª %3$s ã¯ã„ãšã‚Œã‚‚ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¤ã„ã¦ã®è¦æ±‚を満ãŸã›ãªã„ãŸã‚ã€%2$s ã«å¯¾"
"ã™ã‚‹ %1$s ã®ä¾å­˜é–¢ä¿‚を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s ã®ä¾å­˜é–¢ä¿‚ %1$s を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“: インストールã•ã‚ŒãŸ %3$s パッ"
"ケージã¯æ–°ã—ã™ãŽã¾ã™"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s ã®ä¾å­˜é–¢ä¿‚ %1$s を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“: %3$s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s ã®ãƒ“ルドä¾å­˜é–¢ä¿‚を満ãŸã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "ビルドä¾å­˜é–¢ä¿‚ã®å‡¦ç†ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るモジュール:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1359,7 +1354,7 @@ msgstr ""
"apt.conf(5) ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
" ã“ã® APT 㯠Super Cow Powers 化ã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1608,7 +1603,7 @@ msgstr "ファイル %s/%s ãŒãƒ‘ッケージ %s ã®ã‚‚ã®ã‚’上書ãã—ã¾ã™"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1777,11 +1772,11 @@ msgid "File not found"
msgstr "ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "状態ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "変更時刻ã®è¨­å®šã«å¤±æ•—ã—ã¾ã—ãŸ"
@@ -1790,34 +1785,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "ä¸æ­£ãª URI ã§ã™ã€‚ローカル㮠URI 㯠// ã§å§‹ã¾ã£ã¦ã¯ã„ã‘ã¾ã›ã‚“"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "ログインã—ã¦ã„ã¾ã™"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "ピアãƒãƒ¼ãƒ ã‚’決定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "ローカルãƒãƒ¼ãƒ ã‚’決定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "サーãƒã‹ã‚‰æŽ¥ç¶šã‚’拒絶ã•ã‚Œã¾ã—ãŸã€‚応答: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1825,114 +1820,114 @@ msgstr ""
"プロキシサーãƒãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™ãŒã€ãƒ­ã‚°ã‚¤ãƒ³ã‚¹ã‚¯ãƒªãƒ—トãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
"Acquire::ftp::ProxyLogin ãŒç©ºã§ã™ã€‚"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "ログインスクリプトã®ã‚³ãƒžãƒ³ãƒ‰ '%s' 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 失敗ã€ã‚µãƒ¼ãƒå¿œç­”: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "接続タイムアウト"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "サーãƒãŒæŽ¥ç¶šã‚’切断ã—ã¾ã—ãŸ"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "読ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "レスãƒãƒ³ã‚¹ãŒãƒãƒƒãƒ•ã‚¡ã‚’オーãƒãƒ•ãƒ­ãƒ¼ã•ã›ã¾ã—ãŸã€‚"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "プロトコルãŒå£Šã‚Œã¦ã„ã¾ã™"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "書ãè¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "ソケットを作æˆã§ãã¾ã›ã‚“"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "データソケットã¸æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚接続ãŒã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "パッシブソケットã«æŽ¥ç¶šã§ãã¾ã›ã‚“。"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo ã¯ãƒªã‚¹ãƒ‹ãƒ³ã‚°ãƒãƒ¼ãƒˆã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "ソケットをãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "ソケットをリスンã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "ソケットã®åå‰ã‚’特定ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "PORT コマンドをé€ä¿¡ã§ãã¾ã›ã‚“"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "未知ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒª %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT ã«å¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒå¿œç­”: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "データソケット接続タイムアウト"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "接続を accept ã§ãã¾ã›ã‚“"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ファイルã®ãƒãƒƒã‚·ãƒ¥ã§ã®å•é¡Œ"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "ファイルをå–å¾—ã§ãã¾ã›ã‚“。サーãƒå¿œç­” '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "データソケットタイムアウト"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "データ転é€ã«å¤±æ•—ã—ã¾ã—ãŸã€‚サーãƒå¿œç­” '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "å•ã„åˆã‚ã›"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "呼ã³å‡ºã›ã¾ã›ã‚“"
@@ -2043,80 +2038,80 @@ msgstr "%s ã«å¯¾ã—ã¦ãƒ‘イプを開ã‘ã¾ã›ã‚“ã§ã—ãŸ"
msgid "Read error from %s process"
msgstr "%s プロセスã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "ヘッダã®å¾…機中ã§ã™"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u 文字を超ãˆã‚‹ 1 è¡Œã®ãƒ˜ãƒƒãƒ€ã‚’å–å¾—ã—ã¾ã—ãŸ"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "ä¸æ­£ãªãƒ˜ãƒƒãƒ€è¡Œã§ã™"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "http サーãƒãŒä¸æ­£ãªãƒªãƒ—ライヘッダをé€ä¿¡ã—ã¦ãã¾ã—ãŸ"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http サーãƒãŒä¸æ­£ãª Content-Length ヘッダをé€ä¿¡ã—ã¦ãã¾ã—ãŸ"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http サーãƒãŒä¸æ­£ãª Content-Range ヘッダをé€ä¿¡ã—ã¦ãã¾ã—ãŸ"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "http サーãƒã®ãƒ¬ãƒ³ã‚¸ã‚µãƒãƒ¼ãƒˆãŒå£Šã‚Œã¦ã„ã¾ã™"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "ä¸æ˜Žãªæ—¥ä»˜ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§ã™"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "select ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "出力ファイルã¸ã®æ›¸ãè¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "ファイルã¸ã®æ›¸ãè¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "ファイルã¸ã®æ›¸ãè¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "リモートå´ã§æŽ¥ç¶šãŒã‚¯ãƒ­ãƒ¼ã‚ºã•ã‚Œã¦ã‚µãƒ¼ãƒã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "サーãƒã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "ファイルã®åˆ‡ã‚Šè©°ã‚ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "ä¸æ­£ãªãƒ˜ãƒƒãƒ€ã§ã™"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "内部エラー"
@@ -2124,25 +2119,18 @@ msgstr "内部エラー"
msgid "Can't mmap an empty file"
msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ mmap ã§ãã¾ã›ã‚“"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu ãƒã‚¤ãƒˆã® mmap ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2528,14 +2516,14 @@ msgstr "ソースリスト %3$s ã® %2$u è¡Œã«ã‚るタイプ '%1$s' ã¯ä¸æ˜Žã
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "ソースリスト %2$s ã® %1$u 行目ãŒä¸æ­£ã§ã™ (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2546,7 +2534,7 @@ msgstr ""
"ケージ %s を削除ã—ã¾ã™ã€‚ã“ã‚Œã¯å¤šãã®å ´åˆã«å•é¡ŒãŒèµ·ã“る原因ã¨ãªã‚Šã¾ã™ã€‚本当ã«"
"ã“れを行ã„ãŸã„ãªã‚‰ã€APT::Force-LoopBreak オプションを有効ã«ã—ã¦ãã ã•ã„。"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2625,12 +2613,12 @@ msgstr ""
"'%s' ã¨ãƒ©ãƒ™ãƒ«ã®ä»˜ã„ãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’ドライブ '%s' ã«å…¥ã‚Œã¦ enter を押ã—ã¦ãã ã•"
"ã„。"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "パッケージングシステム '%s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "é©åˆ‡ãªãƒ‘ッケージシステムタイプを特定ã§ãã¾ã›ã‚“"
@@ -2769,19 +2757,19 @@ msgstr "ソースキャッシュã®ä¿å­˜ä¸­ã« IO エラーãŒç™ºç”Ÿã—ã¾ã—ã
msgid "rename failed, %s (%s -> %s)."
msgstr "åå‰ã®å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum ãŒé©åˆã—ã¾ã›ã‚“"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "ãƒãƒƒã‚·ãƒ¥ã‚µãƒ ãŒé©åˆã—ã¾ã›ã‚“"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下ã®éµ ID ã«å¯¾ã—ã¦åˆ©ç”¨å¯èƒ½ãªå…¬é–‹éµãŒã‚ã‚Šã¾ã›ã‚“:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2790,7 +2778,7 @@ msgstr ""
"パッケージ %s ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½ç½®ã‚’特定ã§ãã¾ã›ã‚“。ãŠãらãã“ã®ãƒ‘ッケージを手動"
"ã§ä¿®æ­£ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ (存在ã—ãªã„アーキテクãƒãƒ£ã®ãŸã‚)。"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2799,7 +2787,7 @@ msgstr ""
"パッケージ %s ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½ç½®ã‚’特定ã§ãã¾ã›ã‚“。ãŠãらãã“ã®ãƒ‘ッケージを手動"
"ã§ä¿®æ­£ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2807,7 +2795,7 @@ msgstr ""
"パッケージインデックスファイルãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚パッケージ %s ã« Filename: "
"フィールドãŒã‚ã‚Šã¾ã›ã‚“。"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "サイズãŒé©åˆã—ã¾ã›ã‚“"
@@ -2942,78 +2930,101 @@ msgstr ""
"%i レコードを書ãè¾¼ã¿ã¾ã—ãŸã€‚%i 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚‰ãšã€%i 個ã®é©åˆã—ãªã„"
"ファイルãŒã‚ã‚Šã¾ã™ã€‚\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "設定ファイル %s をオープンã§ãã¾ã›ã‚“ã§ã—ãŸ"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "ãƒãƒƒã‚·ãƒ¥ã‚µãƒ ãŒé©åˆã—ã¾ã›ã‚“"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "%s をインストールã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s を設定ã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s を削除ã—ã¦ã„ã¾ã™"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s を完全ã«å‰Šé™¤ã—ã¾ã—ãŸ"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "インストール後トリガ %s を実行ã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "ディレクトリ '%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s を準備ã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s を展開ã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "%s ã®è¨­å®šã‚’準備ã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s をインストールã—ã¾ã—ãŸ"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s ã®å‰Šé™¤ã‚’準備ã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s を削除ã—ã¾ã—ãŸ"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s を完全ã«å‰Šé™¤ã™ã‚‹æº–備をã—ã¦ã„ã¾ã™"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s を完全ã«å‰Šé™¤ã—ã¾ã—ãŸ"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ログã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“。openpty() ã«å¤±æ•—ã—ã¾ã—㟠(/dev/pts ãŒãƒžã‚¦ãƒ³ãƒˆã•ã‚Œã¦ã„ãª"
"ã„?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3039,26 +3050,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "ファイルã«ãƒ‘ッãƒã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "途中ã§æŽ¥ç¶šãŒã‚¯ãƒ­ãƒ¼ã‚ºã•ã‚Œã¾ã—ãŸ"
-#~ msgid "Could not patch file"
-#~ msgstr "ファイルã«ãƒ‘ッãƒã§ãã¾ã›ã‚“ã§ã—ãŸ"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/km.po b/po/km.po
index 184ac5a57..a30ffe945 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -150,14 +150,9 @@ msgstr " ážáŸ’ទាស់​កញ្ចប់ ៖ "
msgid " Version table:"
msgstr " ážáž¶ážšáž¶áž„​កំណែ ៖"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
@@ -655,7 +650,7 @@ msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ប្ážáž¼ážšâ€‹ážˆ
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -816,11 +811,11 @@ msgstr "កញ្ចប់ ​ážáŸ’រូវការឲ្យ​យក​ចáŸ
msgid "Internal error, Ordering didn't finish"
msgstr "កំហុស​ážáž¶áž„ក្នុង​ ការ​រៀប​ážáž¶áž˜â€‹áž›áŸ†ážŠáž¶áž”់​មិន​បាន​បញ្ចប់ឡើយ"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ážážâ€‹áž‘ាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
@@ -849,8 +844,8 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កាá
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ážáž¶ážŸáž“ឹង​​ទំនáŸážšÂ áŸ” \n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណážáŸ‹â€‹áž‘ំហំ​ទំនáŸážšâ€‹áž€áŸ’នុង​ %s បានឡើយ"
@@ -887,7 +882,7 @@ msgstr "បោះបង់ ។"
msgid "Do you want to continue [Y/n]? "
msgstr "ážáž¾â€‹áž¢áŸ’នក​ចង់​បន្ážáž¬â€‹ [បាទ ចាស/áž‘áŸâ€‹] ? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
@@ -896,7 +891,7 @@ msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ទៅ​ប្រម
msgid "Some files failed to download"
msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ទាញ​យក​"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​ážáŸ‚​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
@@ -994,50 +989,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "មិនអាចážáŸ’លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សមáŸáž™â€‹áž‚្មាន​អាគុយម៉ង់​ទáŸ"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "មិន​អាច​ចាក់​សោ​ážážâ€‹áž”ញ្ជីបានឡើយ"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "កញ្ចប់​ážáŸ’មី​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​បាន​ដំឡើង​ ៖"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "កញ្ចប់​ážáŸ’មី​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​បាន​ដំឡើង​ ៖"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1053,51 +1048,51 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "áž–áŸážáŸŒáž˜áž¶áž“​ដូចážáž‘ៅនáŸáŸ‡ អាចជួយ​ដោះស្រាយ​ស្ážáž¶áž“ភាព​បាន ៖"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "កំហុស​ážáž¶áž„ក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យážáž¼áž…​ឧបករណáŸ"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "កំហុស​ážáž¶áž„ក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណáŸâ€‹ážáž¼áž…"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទáŸ"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទáŸ"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ប៉ុន្ážáŸ‚​ %s នឹង​ážáŸ’រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "អ្នក​ប្រហែល​ជា​ចង់​រážáŸ‹ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នáŸáŸ‡Â áŸ–"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
"ភាពអស្រáŸáž™â€‹ážŠáŸ‚ល​ážáž»ážŸâ€‹áž‚្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1109,122 +1104,122 @@ msgstr ""
"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើážâ€‹áž¡áž¾áž™â€‹\n"
" ឬ ​បានយក​ចáŸáž‰â€‹áž–ីការមកដល់ ។"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "កញ្ចប់​ដែល​បាន​ážáž¼áž…​"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "កញ្ចប់​បន្ážáŸ‚ម​ដូចážáž‘ៅនáŸáŸ‡ នឹងážáŸ’រូវបាន​ដំឡើង ៖"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសនáŸÂ áŸ–"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "បាន​បរាជáŸáž™"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "ធ្វើរួច​"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "កំហុស​ážáž¶áž„ក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យážáž¼áž…​ឧបករណáŸ"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ážáŸ’រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនáŸážšâ€‹áž‚្រប់គ្រាន់​ទáŸâ€‹áž“ៅក្នុង​ %s ឡើយ"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ážáŸ’រូវការ​យក​ %sB/%sB នៃ​បáŸážŽáŸ’ណសារ​ប្រភព ។\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ážáŸ’រូវការ​យក​ %sB នៃ​បáŸážŽáŸ’ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការទៅប្រមូលយក​បáŸážŽáŸ’ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជáŸáž™â€‹Â áŸ”\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "áž–áž·áž“áž·ážáŸ’យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជáŸáž™â€‹Â áŸ”\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជáŸáž™â€‹"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "ážáŸ’រូវážáŸ‚​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិážáŸ’áž™ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ពáŸážáŸŒáž˜áž¶áž“​ភាពអស្រáŸáž™â€‹ážŸáž˜áŸ’រាប់ %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រáŸáž™â€‹ážŸáŸ’ážáž¶áž”នាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s ភាពអស្រáŸáž™â€‹ážŸáž˜áŸ’រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពáŸáž‰áž…áž·ážáŸ’ážâ€‹ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,30 +1228,30 @@ msgstr ""
"ភាពអាស្រáŸáž™ %s សម្រាប់ %s មិនអាច​ážáž˜áŸ’រូវចិážáŸ’ážáž”ានទ០ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​ážáž˜áŸ’រូវចិážáŸ’ážâ€‹"
"ážáž˜áŸ’រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ážáž˜áŸ’រូវចិážáŸ’ážáž—ាពអាស្រáŸáž™ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺážáŸ’មីពáŸáž€"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​ážáž˜áŸ’រូវចិážáŸ’ážáž—ាពអាស្រáŸáž™ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រáŸáž™â€‹ážŠáŸ‚ល​បង្កើážâ€‹ %s មិន​អាច​បំពáŸáž‰â€‹ážŸáŸáž…ក្ដី​ážáŸ’រូវការ​បាន​ទáŸÂ áŸ”"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ដំណើរ​​ការ​បង្កើážâ€‹áž—ាព​អាស្រáŸáž™"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1339,7 +1334,7 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1587,7 +1582,7 @@ msgstr "ឯកសារ​ %s/%s សរសáŸážšáž‡áž¶áž“់​ពីលើ​áž
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1753,11 +1748,11 @@ msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការážáŸ’លែង"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "បរាជáŸáž™áž€áŸ’នុងការកំណážáŸ‹â€‹áž–áŸáž›ážœáŸáž›áž¶â€‹áž€áž¶ážšáž€áŸ‚ប្រែ​"
@@ -1766,148 +1761,148 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI មិនážáŸ’រឹមážáŸ’រូវ​ URIS មូលដ្ឋានមិនážáŸ’រូវ​ចាប់ផ្ážáž¾áž˜â€‹áž‡áž¶áž˜áž½áž™â€‹ // ឡើយ"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "កំពុង​ចូល​"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "មិន​អាច​កំណážáŸ‹ážˆáŸ’មោះដែលážáŸ’រូវបង្ហាញ​បានឡើយ​"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "មិន​អាច​កំណážáŸ‹ážˆáŸ’មោះមូលដ្ឋាន​បានឡើយ"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "ម៉ាស៊ីន​បម្រើបានបដិសáŸáž’​ការážáž—្ជាប់ ហើយ​ បាននិយាយ ៖ %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER បរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS បានបរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ážáŸ’រូវ​បាន​បញ្ជាក់​ ប៉ុន្ážáŸ‚​គ្មាន​ស្គ្រីប​ចូល​ទ០Acquire::ftp::ProxyLogin គឺ áž‘áž‘áŸÂ áŸ”"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជáŸáž™ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE បានបរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "អស់ពáŸáž›â€‹áž€áŸ’នុងការážáž—្ជាប់​"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការážáž—្ជាប់​"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "ការអាន​មានកំហុស"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "ឆ្លើយážáž”​សážáž·â€‹áž”ណ្ážáŸ„ះអាសន្ន​​អស់ចំណុះ ។"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "ការបង្ážáž¼áž…​ពិធីការ​"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "ការសរសáŸážšâ€‹áž˜áž¶áž“កំហុស"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "មិន​អាច​បង្កើážâ€‹ážšáž“្ធបានឡើយ"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "មិន​អាច​ážáž—្ជាប់​​រន្ធទិន្ននáŸáž™â€‹áž”ានឡើយ អស់​ពáŸáž›â€‹áž€áŸ’នុងការážáž—្ជាប់​"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "មិនអាចážáž—្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្ážáž¶áž”់​​បានឡើយ"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "មិន​អាច​កំណážáŸ‹â€‹ážˆáŸ’មោះរបស់​រន្ធ​បានឡើយ"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT បរាជáŸáž™â€‹ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "ការážáž—្ជាប់​រន្ធ​​ទិន្ននáŸáž”ានអស់ពáŸáž›â€‹"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "មិនអាច​ទទួលយក​ការážáž—្ជាប់​បានឡើយ"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "បញ្ហា​ធ្វើឲ្យážáž¼áž…​ឯកសារ"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "រន្ធ​ទិន្ននáŸáž™â€‹áž”ាន​អស់​ពáŸáž›â€‹"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "បរាជáŸáž™áž€áŸ’នុងការ​ផ្ទáŸážšâ€‹áž‘ិន្ននáŸáž™ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "សំណួរ​"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "មិន​អាច​ហៅ​ "
@@ -2015,81 +2010,81 @@ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប
msgid "Read error from %s process"
msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "កំពុង​រង់ចាំ​បឋមកážáž¶"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "យកបន្ទាážáŸ‹â€‹áž”ឋមកážáž¶â€‹ážáŸ‚មួយ​​ ដែលលើស %u ážáž½áž¢áž€áŸ’សរ"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "ជួរ​បឋមកážáž¶â€‹ážáž¼áž…​"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកážáž¶áž…ម្លើយážáž”មិនážáŸ’រឹមážáŸ’រូវ"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកážáž¶áž”្រវែង​​​មាážáž·áž€áž¶â€‹áž˜áž·áž“ážáŸ’រឹមážáŸ’រូវ​"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកážáž¶â€‹áž‡áž½ážšâ€‹áž˜áž¶ážáž·áž€áž¶â€‹áž˜áž·áž“​ážáŸ’រឹមážáŸ’រូវ​"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "ម៉ាស៊ីន​បម្រើ HTTP áž“áŸáŸ‡áž”ាន​ážáž¼áž…​​​ជួរ​គាំទ្រ​"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆáŸáž‘"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "ជ្រើស​បាន​បរាជáŸáž™â€‹"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "ការážáž—្ជាប់​បាន​អស់ពáŸáž›â€‹"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "កំហុស​ក្នុងការ​សរសáŸážšáž‘ៅកាន់​ឯកសារលទ្ធផល"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "កំហុស​ក្នុងការ​សរសáŸážšáž‘ៅកាន់​ឯកសារ"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "កំហុសក្នុងការ​សរសáŸážšâ€‹áž‘ៅកាន់​ឯកសារ"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការážáž—្ជាប់"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​សរសáŸážšâ€‹áž¯áž€ážŸáž¶ážš %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "ទិន្ននáŸáž™â€‹áž”ឋមកážáž¶â€‹ážáž¼áž…"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "ការážáž—្ជាប់​បាន​បរាជáŸáž™â€‹"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "កំហុស​ážáž¶áž„​ក្នុង​"
@@ -2097,25 +2092,18 @@ msgstr "កំហុស​ážáž¶áž„​ក្នុង​"
msgid "Can't mmap an empty file"
msgstr "មិនអាច mmap ឯកសារទទáŸâ€‹áž”ានឡើយ"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "មិន​អាច​បង្កើážâ€‹ mmap នៃ​ %lu បៃបានឡើយ"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2502,14 +2490,14 @@ msgstr "ប្រភáŸáž‘​ '%s' មិន​ស្គាល់នៅលើប
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "បន្ទាážáŸ‹â€‹ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (áž›áŸážážŸáž˜áŸ’គាល់​ក្រុមហ៊ុន​លក់)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2520,7 +2508,7 @@ msgstr ""
"ភាពអាស្រáŸáž™áž‡áž¶áž˜áž»áž“ ។ ជាញឹកញាប់គឺ មិនážáŸ’រឹមážáŸ’រូវ ប៉ុន្ážáŸ‚ ប្រសិនបើអ្នក​ពិážáž‡áž¶áž…ង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
"Force-LoopBreak សកម្ម ។"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2594,12 +2582,12 @@ msgstr "វិធីសាស្ážáŸ’រ​ %s មិន​អាច​ចាáž
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កážáŸ‹â€‹áž…ូល ។"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "មិន​គាំទ្រ​ប្រពáŸáž“្ធ​កញ្ចប់'%s' ឡើយ"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "មិនអាច​កំណážáŸ‹â€‹áž”្រភáŸáž‘​ប្រពáŸáž“្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
@@ -2733,20 +2721,20 @@ msgstr "IO កំហុសក្នុងការររក្សាទុក​
msgid "rename failed, %s (%s -> %s)."
msgstr "ប្ážáž¼ážšâ€‹ážˆáŸ’មោះ​បានបរាជáŸáž™â€‹, %s (%s -> %s) ។"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ážáž¶áž„ក្រោម​នáŸáŸ‡áž‘áŸÂ áŸ–\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2755,7 +2743,7 @@ msgstr ""
"ážáŸ’ញុំ​មិន​អាច​រកទីážáž¶áŸ†áž„​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទáŸÂ áŸ” ​មាន​នáŸáž™â€‹ážáž¶â€‹áž¢áŸ’នក​ážáŸ’រូវការ​ជួសជុល​កញ្ចប់​នáŸáŸ‡â€‹ážŠáŸ„យ​ដៃ ។ "
"(ដោយសារ​​បាážáŸ‹â€‹ážŸáŸ’ážáž¶áž”ážáŸ’យកម្ម)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2763,13 +2751,13 @@ msgid ""
msgstr ""
"ážáŸ’ញុំ​មិន​អាច​រកទីážáž¶áŸ†áž„​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទáŸÂ áŸ” ​មាន​នáŸáž™â€‹ážáž¶â€‹áž¢áŸ’នក​ážáŸ’រូវការ​ជួសជុល​កញ្ចប់​នáŸáŸ‡â€‹ážŠáŸ„យ​ដៃ ។"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ážáŸ’រូវ​បាន​ážáž¼áž… ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នáŸáŸ‡â€‹áž‘áŸâ€‹ %s ។"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
@@ -2901,76 +2889,98 @@ msgstr "បានសរសáŸážšâ€‹ %i កំណážáŸ‹ážáŸ’រា​ជាមáž
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "បានសរសáŸážš %i កំណážáŸ‹ážáŸ’រា​ជាមួយ​ %i ឯកសារ​ដែល​បាážáŸ‹áž”ង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "កំពុង​បើ​ឯកសារ​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ​ %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "បាន​ដំឡើង %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "កំពុង​កំណážáŸ‹â€‹ážšáž…នា​សម្ពáŸáž“្ធ %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "កំពុង​យក %s áž…áŸáž‰"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "បាន​យក %s áž…áŸáž‰â€‹áž‘ាំង​ស្រុង"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "រាយបញ្ជី​ážážâ€‹ %spartial គឺ​បាážáŸ‹áž”ង់​ ។"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "កំពុងរៀបចំ​ %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "កំពុង​ស្រាយ %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "កំពុងរៀបចំ​កំណážáŸ‹ážšáž…នាសម្ពáŸáž“្ធ %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "បាន​ដំឡើង %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចáŸáž‰â€‹áž“ៃ %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "បាន​យក %s áž…áŸáž‰"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "កំពុង​រៀបចំ​យក %s áž…áŸáž‰â€‹áž‘ាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "បាន​យក %s áž…áŸáž‰â€‹áž‘ាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2996,27 +3006,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "បាន​បិទ​ការ​ážáž—្ជាប់​មុន​ពáŸáž›"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/ko.po b/po/ko.po
index 66c5874f2..bd0a0b003 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-13 07:14+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -142,14 +142,9 @@ msgstr " 패키지 핀: "
msgid " Version table:"
msgstr " 버전 í…Œì´ë¸”:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s(%s), ì»´íŒŒì¼ ì‹œê° %s %s\n"
@@ -648,7 +643,7 @@ msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "ì •ê·œì‹ ì»´íŒŒì¼ ì˜¤ë¥˜ - %s"
@@ -810,11 +805,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지ë˜ì–´ 있습니다.
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. ìˆœì„œë³€ê²½ìž‘ì—…ì´ ë나지 않았습니다"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "소스 목ë¡ì„ ì½ì„ 수 없습니다."
@@ -845,8 +840,8 @@ msgstr "ì´ ìž‘ì—… 후 %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì„ ë” ì‚¬ìš©í•˜ê²Œ ë©ë‹
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "ì´ ìž‘ì—… 후 %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì´ ë¹„ì›Œì§‘ë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%sì˜ ì—¬ìœ  ê³µê°„ì˜ í¬ê¸°ë¥¼ 파악할 수 없습니다"
@@ -886,7 +881,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "ê³„ì† í•˜ì‹œê² ìŠµë‹ˆê¹Œ [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n"
@@ -895,7 +890,7 @@ msgstr "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n"
msgid "Some files failed to download"
msgstr "ì¼ë¶€ 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
@@ -994,49 +989,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s íŒ¨í‚¤ì§€ì˜ %1$s (%2$s) ë²„ì „ì„ ì„ íƒí•©ë‹ˆë‹¤\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "소스 패키지 ëª©ë¡ %sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "update ëª…ë ¹ì€ ì¸ìˆ˜ë¥¼ 받지 않습니다"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "ëª©ë¡ ë””ë ‰í† ë¦¬ë¥¼ 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "ë‹¤ìŒ ìƒˆ 패키지가 ì „ì— ìžë™ìœ¼ë¡œ 설치ë˜ì—ˆì§€ë§Œ ë” ì´ìƒ 필요하지 않습니다:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "ë‹¤ìŒ ìƒˆ 패키지가 ì „ì— ìžë™ìœ¼ë¡œ 설치ë˜ì—ˆì§€ë§Œ ë” ì´ìƒ 필요하지 않습니다:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ì´ë“¤ì„ 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1054,44 +1049,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "ì´ ìƒí™©ì„ 해결하는 ë° ë‹¤ìŒ ì •ë³´ê°€ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "내부 오류, 문제 í•´ê²° í”„ë¡œê·¸ëž¨ì´ ë¬´ì–¸ê°€ë¥¼ ë§ê°€ëœ¨ë ¸ìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade í”„ë¡œê·¸ëž¨ì´ ë¬´ì–¸ê°€ë¥¼ ë§ê°€ëœ¨ë ¸ìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "%s 작업를 ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 패키지를 ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주ì˜, ì •ê·œì‹ '%2$s'ì— ëŒ€í•˜ì—¬ %1$sì„(를) ì„ íƒí•©ë‹ˆë‹¤\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 패키지 수ë™ì„¤ì¹˜ë¡œ 지정합니다.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다ìŒì„ 바로잡으려면 `apt-get -f install'ì„ ì‹¤í–‰í•´ 보십시오:"
# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1099,7 +1094,7 @@ msgstr ""
"ì˜ì¡´ì„±ì´ 맞지 않습니다. 패키지 ì—†ì´ 'apt-get -f install'ì„ ì‹œë„í•´ 보십시오 "
"(아니면 í•´ê²° ë°©ë²•ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1110,115 +1105,115 @@ msgstr ""
"불안정 ë°°í¬íŒì„ 사용해서 ì¼ë¶€ 필요한 패키지를 ì•„ì§ ë§Œë“¤ì§€ 않았거나,\n"
"ì•„ì§ Incomingì—ì„œ 나오지 ì•Šì€ ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "ë§ê°€ì§„ 패키지"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ ë” ì„¤ì¹˜í•  것입니다:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "제안하는 패키지:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "추천하는 패키지:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "업그레ì´ë“œë¥¼ 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 í•´ê²° í”„ë¡œê·¸ëž¨ì´ ë¬´ì–¸ê°€ë¥¼ ë§ê°€ëœ¨ë ¸ìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "해당ë˜ëŠ” 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%sì˜ ì†ŒìŠ¤ 패키지를 ì°¾ì„ ìˆ˜ 없습니다"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ì´ë¯¸ 다운로드 ë°›ì€ íŒŒì¼ '%s'ì€(는) 다시 받지 ì•Šê³  건너 ëœë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%sì— ì¶©ë¶„í•œ ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 ì•„ì¹´ì´ë¸Œë¥¼ %së°”ì´íŠ¸/%së°”ì´íŠ¸ 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 ì•„ì¹´ì´ë¸Œë¥¼ %së°”ì´íŠ¸ 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "ì¼ë¶€ ì•„ì¹´ì´ë¸Œë¥¼ 가져오는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%sì— ì´ë¯¸ 풀려 있는 ì†ŒìŠ¤ì˜ ì••ì¶•ì„ í’€ì§€ ì•Šê³  건너 ëœë‹ˆë‹¤.\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치ë˜ì—ˆëŠ”지를 확ì¸í•˜ì‹­ì‹œì˜¤.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "해당ë˜ëŠ” 빌드 ì˜ì¡´ì„±ì„ 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%sì˜ ë¹Œë“œ ì˜ì¡´ì„± 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s íŒ¨í‚¤ì§€ì— ë¹Œë“œ ì˜ì¡´ì„±ì´ 없습니다.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1227,7 +1222,7 @@ msgstr ""
"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s 패키지를 ì°¾ì„ ìˆ˜ 없습니"
"다"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1231,32 @@ msgstr ""
"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s íŒ¨í‚¤ì§€ì˜ ì‚¬ìš© 가능한 버"
"ì „ 중ì—서는 ì´ ë²„ì „ ìš”êµ¬ì‚¬í•­ì„ ë§Œì¡±ì‹œí‚¬ 수 없습니다"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시키는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: 설치한 %3$s 패키지가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시키는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %3$s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%sì˜ ë¹Œë“œ ì˜ì¡´ì„±ì„ 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "빌드 ì˜ì¡´ì„±ì„ 처리하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "지ì›í•˜ëŠ” 모듈:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1345,7 +1340,7 @@ msgstr ""
"apt.conf(5) 매뉴얼 페ì´ì§€ë¥¼ 보십시오.\n"
" ì´ APT는 Super Cow Powersë¡œ 무장했습니다.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1595,7 +1590,7 @@ msgstr "%s/%s 파ì¼ì€ %s íŒ¨í‚¤ì§€ì— ìžˆëŠ” 파ì¼ì„ ë®ì–´ ì”니다"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1761,11 +1756,11 @@ msgid "File not found"
msgstr "파ì¼ì´ 없습니다"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "íŒŒì¼ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "íŒŒì¼ ë³€ê²½ ì‹œê°ì„ 설정하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -1774,34 +1769,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다."
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "로그ì¸í•˜ëŠ” 중입니다"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "ìƒëŒ€ë°©ì˜ ì´ë¦„ì„ ì•Œ 수 없습니다"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "로컬 ì´ë¦„ì„ ì•Œ 수 없습니다"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "서버ì—ì„œ 다ìŒê³¼ ê°™ì´ ì—°ê²°ì„ ê±°ë¶€í–ˆìŠµë‹ˆë‹¤: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 실패, 서버ì—서는: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 실패, 서버ì—서는: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1809,114 +1804,114 @@ msgstr ""
"프ë¡ì‹œ 서버를 지정했지만 ë¡œê·¸ì¸ ìŠ¤í¬ë¦½íŠ¸ê°€ 없습니다. Acquire::ftp::"
"ProxyLogin ê°’ì´ ë¹„ì–´ 있습니다."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "ë¡œê·¸ì¸ ìŠ¤í¬ë¦½íŠ¸ 명령 '%s' 실패, 서버ì—서는: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 실패, 서버ì—서는: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "연결 시간 초과"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "서버ì—ì„œ ì—°ê²°ì„ ë‹«ì•˜ìŠµë‹ˆë‹¤"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "ì½ê¸° 오류"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "ì‘ë‹µì´ ë²„í¼ í¬ê¸°ë¥¼ 넘어갔습니다."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "í”„ë¡œí† ì½œì´ í‹€ë ¸ìŠµë‹ˆë‹¤"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "쓰기 오류"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "ì†Œì¼“ì„ ë§Œë“¤ 수 없습니다"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "ë°ì´í„° ì†Œì¼“ì„ ì—°ê²°í•  수 없습니다. ì—°ê²° ì‹œê°„ì´ ì´ˆê³¼ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "수ë™(passive) ì†Œì¼“ì„ ì—°ê²°í•  수 없습니다."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfoì—ì„œ ì†Œì¼“ì— listení•  수 없습니다"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "ì†Œì¼“ì„ bindí•  수 없습니다"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "ì†Œì¼“ì— listení•  수 없습니다"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "ì†Œì¼“ì˜ ì´ë¦„ì„ ì•Œì•„ë‚¼ 수 없습니다"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "PORT ëª…ë ¹ì„ ë³´ë‚¼ 수 없습니다"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "주소 %uì˜ ì¢…ë¥˜(AF_*)를 ì•Œ 수 없습니다"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 실패, 서버ì—서는: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "ë°ì´í„° 소켓 ì—°ê²° 시간 초과"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "ì—°ê²°ì„ ë°›ì„ ìˆ˜ 없습니다"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "íŒŒì¼ í•´ì‹±ì— ë¬¸ì œê°€ 있습니다"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "파ì¼ì„ 가져올 수 없습니다. 서버 왈, '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "ë°ì´í„° ì†Œì¼“ì— ì œí•œ ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "ë°ì´í„° 전송 실패, 서버ì—서는: %s"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "질ì˜"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "다ìŒì„ 실행할 수 없습니다: "
@@ -2026,80 +2021,80 @@ msgstr "%sì— ëŒ€í•œ 파ì´í”„를 ì—´ 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "í—¤ë”를 기다리는 중입니다"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "í—¤ë” í•œ ì¤„ì— %u개가 넘는 문ìžê°€ 들어 있습니다"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "í—¤ë” ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ ì‘답 í—¤ë”를 보냈습니다"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ Content-Length í—¤ë”를 보냈습니다"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ Content-Range í—¤ë”를 보냈습니다"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "HTTP ì„œë²„ì— ë²”ìœ„ ì§€ì› ê¸°ëŠ¥ì´ ìž˜ëª»ë˜ì–´ 있습니다"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "ë°ì´í„° 형ì‹ì„ ì•Œ 수 없습니다"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "ì—°ê²° ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "출력 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "해당 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "서버ì—ì„œ ì½ê³  ì—°ê²°ì„ ë‹«ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "서버ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "파ì¼ì„ ìžë¥´ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "í—¤ë” ë°ì´í„°ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "ì—°ê²°ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "내부 오류"
@@ -2107,25 +2102,18 @@ msgstr "내부 오류"
msgid "Can't mmap an empty file"
msgstr "빈 파ì¼ì— 메모리 매핑할 수 없습니다"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%luë°”ì´íŠ¸ë¥¼ 메모리 매핑할 수 없습니다"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2511,14 +2499,14 @@ msgstr "소스 ëª©ë¡ %3$sì˜ %2$u번 ì¤„ì˜ '%1$s' íƒ€ìž…ì„ ì•Œ 수 없습니ë
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (ë²¤ë” ID)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2529,7 +2517,7 @@ msgstr ""
"ìž ê¹ ì§€ì›Œì•¼ 합니다. ì´ íŒ¨í‚¤ì§€ë¥¼ 지우는 ê±´ 좋지 않지만, ì •ë§ ì§€ìš°ë ¤ë©´ APT::"
"Force-LoopBreak ì˜µì…˜ì„ ì¼œì‹­ì‹œì˜¤."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2606,12 +2594,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"'%2$s' ë“œë¼ì´ë¸Œì— '%1$s'(으)ë¡œ í‘œê¸°ëœ ë””ìŠ¤í¬ë¥¼ 넣고 Enter를 누르십시오."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' 패키지 ì‹œìŠ¤í…œì„ ì§€ì›í•˜ì§€ 않습니다"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 패키지 시스템 íƒ€ìž…ì„ ì•Œì•„ë‚¼ 수 없습니다"
@@ -2744,19 +2732,19 @@ msgstr "소스 ìºì‹œë¥¼ 저장하는 ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤
msgid "rename failed, %s (%s -> %s)."
msgstr "ì´ë¦„ 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sumì´ ë§žì§€ 않습니다"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "해쉬 합계가 서로 다릅니다"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "ë‹¤ìŒ í‚¤ IDì˜ ê³µê°œí‚¤ê°€ 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2765,7 +2753,7 @@ msgstr ""
"%s íŒ¨í‚¤ì§€ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ íŒ¨í‚¤ì§€ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ"
"니다. (아키í…ì³ê°€ 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2774,14 +2762,14 @@ msgstr ""
"%s íŒ¨í‚¤ì§€ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ íŒ¨í‚¤ì§€ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ"
"니다."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"패키지 ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤. %s íŒ¨í‚¤ì§€ì— Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "í¬ê¸°ê°€ 맞지 않습니다"
@@ -2912,77 +2900,100 @@ msgstr "레코드 %i개를 íŒŒì¼ %i개가 맞지 ì•Šì€ ìƒíƒœë¡œ ì¼ìŠµë‹ˆë‹¤\
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 íŒŒì¼ %i개가 빠지고 %i개가 맞지 ì•Šì€ ìƒíƒœë¡œ ì¼ìŠµë‹ˆë‹¤\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "설정 íŒŒì¼ %s 파ì¼ì„ 여는 중입니다"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "해쉬 합계가 서로 다릅니다"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "%s 설치하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s 설정 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s 패키지를 지우는 중입니다"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s 패키지를 완전히 지웠습니다"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "설치 후 트리거 %s 실행하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "디렉토리 '%s' 없습니다."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s 준비 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s 푸는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "%s 패키지를 설정할 준비하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s 설치"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s 패키지를 지울 준비하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s 지움"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ë¡œê·¸ì— ì“°ëŠ”ë° ì‹¤íŒ¨. openpty() 실패(/dev/ptsê°€ 마운트ë˜ì–´ìžˆì§€ 않습니까?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3008,26 +3019,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "%s 파ì¼ì„ ì—´ 수 없습니다"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "ì—°ê²°ì´ ë„ˆë¬´ 빨리 ëŠì–´ì¡ŒìŠµë‹ˆë‹¤"
-#~ msgid "Could not patch file"
-#~ msgstr "%s 파ì¼ì„ ì—´ 수 없습니다"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/ku.po b/po/ku.po
index 752e98f8f..2c9c3dcfb 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: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\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"
@@ -149,14 +149,9 @@ msgstr " Destika pakêtê:"
msgid " Version table:"
msgstr " Tabloya guhertoyan:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
@@ -567,7 +562,7 @@ msgstr ""
msgid "Y"
msgstr "E"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -726,11 +721,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -759,8 +754,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
@@ -794,7 +789,7 @@ msgstr "Betal."
msgid "Do you want to continue [Y/n]? "
msgstr "Dixwazî bidomînî [E/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
@@ -803,7 +798,7 @@ msgstr "Anîna %s %s biserneket\n"
msgid "Some files failed to download"
msgstr "Daxistina çend pelan biserneket"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr ""
@@ -896,50 +891,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -955,49 +950,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Peywira %s nehate dîtin"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1005,152 +1000,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Paketên şikestî"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Paketên tên pêşniyaz kirin:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Paketên tên tawsiyê kirin:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Serneket"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Temam"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Cihê vala li %s têre nake"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1194,7 +1189,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1430,7 +1425,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1592,12 +1587,12 @@ msgid "File not found"
msgstr "Pel nehate dîtin"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr ""
@@ -1606,147 +1601,147 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Têketin"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nikare navê herêmî tesbît bike"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Çewiya xwendinê"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Çewtiya nivîsînê"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, fuzzy, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Danegira %s nehate vekirin: %s"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Lêpirsîn"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
#, fuzzy
msgid "Unable to invoke "
msgstr "%s venebû"
@@ -1856,82 +1851,82 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Hilbijartin neserketî"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:816
+#: methods/http.cc:818
#, fuzzy
msgid "Error writing to output file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nivîsîna pelê %s biserneket"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Girêdan pêk nehatiye"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Çewtiya hundirîn"
@@ -1939,25 +1934,18 @@ msgstr "Çewtiya hundirîn"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2343,14 +2331,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2358,7 +2346,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2429,12 +2417,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2567,39 +2555,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "nav guherandin biserneket, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, 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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
@@ -2728,76 +2716,98 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum li hev nayên"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "%s hatine sazkirin"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s tê mîhengkirin"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s tê rakirin"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s bi tevahî hatine rakirin"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s tê derxistin"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Mîhengkirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s hatine sazkirin"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Rakirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Bi tevahî rakirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2823,27 +2833,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "Danegira %s nehate vekirin: %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Girêdan zû hatiye girtin"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "Danegira %s nehate vekirin: %s"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/lt.po b/po/lt.po
index 315c4ee02..aa12c3437 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -148,14 +148,9 @@ msgstr " Paketo susiejimai: "
msgid " Version table:"
msgstr " Versijų lentelė:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -622,7 +617,7 @@ msgstr "Nepavyko pervadinti %s į %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -784,11 +779,11 @@ msgstr "Reikia paÅ¡alinti paketus, taÄiau Å¡alinimas iÅ¡jungtas."
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nepavyko perskaityti šaltinių sąrašo."
@@ -817,8 +812,8 @@ msgstr "Po Å¡ios operacijos bus naudojama %sB papildomos disko vietos.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po Å¡ios operacijos bus atlaisvinta %sB disko vietos.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nepavyko nustatyti %s laisvos vietos"
@@ -855,7 +850,7 @@ msgstr "Nutraukti."
msgid "Do you want to continue [Y/n]? "
msgstr "Ar norite tęsti [T/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
@@ -864,7 +859,7 @@ msgstr "Nepavyko parsiųsti %s %s\n"
msgid "Some files failed to download"
msgstr "Nepavyko parsiųsti kai kurių failų"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
@@ -963,49 +958,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Pažymėta versija %s (%s) paketui %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Atnaujinimo komandai argumentų nereikia"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Nepavyko užrakinti sąrašo aplanko"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1021,43 +1016,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Nepavyko rasti užduoties %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1065,7 +1060,7 @@ msgstr ""
"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
"nurodytų paketų (arba nurodykite išeitį)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1077,115 +1072,115 @@ msgstr ""
"leidimÄ…, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
"pašalinti iš \"Incoming\" aplanko."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Sugadinti paketai"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Bus įdiegti šie papildomi paketai:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Siūlomi paketai:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Rekomenduojami paketai:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "SkaiÄiuojami atnaujinimai... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Nepavyko"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Įvykdyta"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Neturite pakankamai laisvos vietos %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "ParsiunÄiamas archyvas %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Jau išpakuotas archyvas %s praleidžiama\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Klaida procese-palikuonyje"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1193,7 +1188,7 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1202,32 +1197,32 @@ msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
"versijos %s paketo"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra "
"per naujas"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nepavyko patenkinti %s priklausomybÄ—s %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1271,7 +1266,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1524,7 +1519,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1686,11 +1681,11 @@ msgid "File not found"
msgstr "Failas nerastas"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr ""
@@ -1699,147 +1694,147 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Jungiamasi"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Jungiamasi per ilgai"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Skaitymo klaida"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Rašymo klaida"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Užklausti"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1947,81 +1942,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Laukiama antraÅ¡Äių"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Prisijungimo laiko limitas baigÄ—si"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Klaida bandant rašyti į failą"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nepavyko patikrinti %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Prisijungti nepavyko"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "VidinÄ— klaida"
@@ -2029,25 +2024,18 @@ msgstr "VidinÄ— klaida"
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2433,14 +2421,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2448,7 +2436,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2521,12 +2509,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2661,39 +2649,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5 sumos neatitikimas"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, 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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
@@ -2822,76 +2810,99 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Skipping already downloaded file '%s'\n"
+msgid "Skipping nonexistent file %s"
+msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Maišos sumos nesutapimas"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Įdiegta %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Konfigūruojamas %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Å alinamas %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Visiškai pašalintas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Ruošiamas %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "IÅ¡pakuojamas %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Ruošiamasi konfigūruoti %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Įdiegta %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Ruošiamasi %s pašalinimui"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Ruošiamasi visiškai pašalinti %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2917,24 +2928,19 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+#| msgid "Could not open file %s"
+msgid "Could not patch file"
+msgstr "Nepavyko atverti failo %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/mr.po b/po/mr.po
index 277aafebe..53fe538d1 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -144,14 +144,9 @@ msgstr "पॅकेज (पिन):"
msgid " Version table:"
msgstr "आवृतà¥à¤¤à¥€ कोषà¥à¤Ÿà¤•:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s हे %s करिता %s %s वर संगà¥à¤°à¤¹à¤¿à¤¤\n"
@@ -648,7 +643,7 @@ msgstr "%s ला पà¥à¤¨à¤°à¥à¤¨à¤¾à¤®à¤¾à¤‚कन %s करणà¥à¤¯à¤¾à¤¸
msgid "Y"
msgstr "होय"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेकà¥à¤¸ कंपायलेशन तà¥à¤°à¥à¤Ÿà¥€ -%s "
@@ -809,11 +804,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे
msgid "Internal error, Ordering didn't finish"
msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€,कà¥à¤°à¤® अजून संपला नाही"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेकà¥à¤Ÿà¤°à¥€ कà¥à¤²à¥‚पबंद करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "उगमांचà¥à¤¯à¤¾ यादà¥à¤¯à¤¾ वाचता येणार नाहीत."
@@ -842,8 +837,8 @@ msgstr "या कà¥à¤°à¤¿à¤¯à¥‡à¤¨à¤‚तर, %sB à¤à¤µà¤¢à¥€ अधिक ड
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "या कà¥à¤°à¤¿à¤¯à¥‡à¤¨à¤‚तर, %sB डिसà¥à¤• जागा मोकळी होईल.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मधà¥à¤¯à¥‡ रिकामी जागा सांगू शकत नाही"
@@ -880,7 +875,7 @@ msgstr "वà¥à¤¯à¤¤à¥à¤¯à¤¯/बंद करा."
msgid "Do you want to continue [Y/n]? "
msgstr "तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ पà¥à¤¢à¥‡ जायचे आहे [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
@@ -889,7 +884,7 @@ msgstr "%s %s आणणे असफल\n"
msgid "Some files failed to download"
msgstr "काही संचिका डाऊनलोड करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूरà¥à¤£ आणि डाऊनलोड मधà¥à¤¯à¥‡ फकà¥à¤¤ पदà¥à¤§à¤¤à¥€"
@@ -988,49 +983,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "%s साठी %s (%s) निवडलेली आवृतà¥à¤¤à¥€.\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "%s उगम पॅकेज यादी सà¥à¤°à¥‚ करता येत नाही"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "सà¥à¤§à¤¾à¤°à¤¿à¤¤ आवृतà¥à¤¤à¥€à¤šà¤¾ विधान आरà¥à¤—à¥à¤¯à¥à¤®à¥‡à¤‚टस घेऊ शकत नाही."
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "संचयिका यादीला कà¥à¤²à¥à¤ª लावणà¥à¤¯à¤¾à¤¤ असमरà¥à¤¥"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "आपण या गोषà¥à¤Ÿà¥€ काढून टाकता नये, ऑटोरिमूवà¥à¤¹à¤° सà¥à¤°à¥‚ करता येत नाही"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "खालील नवीन पॅकेजेस सà¥à¤µà¤¯à¤‚चलितपणे संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¾à¤²à¥€ होती व आता आवशà¥à¤¯à¤• नाहीत:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "खालील नवीन पॅकेजेस सà¥à¤µà¤¯à¤‚चलितपणे संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¾à¤²à¥€ होती व आता आवशà¥à¤¯à¤• नाहीत:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ती काढून टाकणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ 'apt-get autoremove' वापरा."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1048,45 +1043,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "खालील माहिती परिसà¥à¤¥à¤¿à¤¤à¥€ निवळणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ मदत ठरू शकेल:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€, AutoRemoverने सà¥à¤Ÿà¤«à¤²à¤¾ तोडले"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€,ऑलअपगà¥à¤°à¥‡à¤¡à¤¨à¥‡ सà¥à¤Ÿà¤«à¤²à¤¾ तोडले"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "%s कारà¥à¤¯ सापडू शकले नाही"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "सूचना, '%s' रिजेकà¥à¤¸ साठी %s ची निवड करत आहे\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s सà¥à¤µà¤¹à¤¸à¥à¤¤à¥‡ संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ करायचे आहे.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ कदाचित `apt-get -f install'(à¤à¤ªà¥€à¤Ÿà¥€-गेट -à¤à¤« संसà¥à¤¥à¤¾à¤ªà¤¨') पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® चालू करावा "
"लागेल'यात बदल करणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1089,7 @@ msgstr ""
"अनमेट डिपेंडनà¥à¤¸à¥€à¤œ.à¤à¤ªà¥€à¤Ÿà¥€-गेट -à¤à¤« संसà¥à¤¥à¤¾à¤ªà¤¨ (`apt-get -f install') पॅकेजशिवाय पà¥à¤°à¤¯à¤¤à¥à¤¨ करा "
"(किंवा परà¥à¤¯à¤¾à¤¯ सांगा)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1106,122 +1101,122 @@ msgstr ""
"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
"किंवा ती येणाऱà¥à¤¯à¤¾à¤‚पैकी बाहेर हलविली असतील."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "तà¥à¤Ÿà¤²à¥‡à¤²à¥€ पॅकेजेस"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "खालील अतिरिकà¥à¤¤ पॅकेजेस संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ होतील:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "सà¥à¤šà¤µà¤²à¥‡à¤²à¥€ पॅकेजेस:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "शिफारस केलेली पॅकेजेस:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "पà¥à¤¢à¤¿à¤² आवृतà¥à¤¤à¥€à¤šà¥€ गणती करीत आहे..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "असमरà¥à¤¥"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "à¤à¤¾à¤²à¥‡"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€, अडचण निवारकाने सà¥à¤Ÿà¤«à¤²à¤¾ तोडले"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ किमान à¤à¤• पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शकà¥à¤¯ नाही/शोधणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥ आहे"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून दà¥à¤¯à¤¾\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s मधà¥à¤¯à¥‡ पà¥à¤°à¥‡à¤¶à¥€ जागा नाही"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "उगम अरà¥à¤•à¤¾à¤ˆà¤µà¥à¤¹à¤œ चा %sB/%sB घेणà¥à¤¯à¤¾à¤šà¥€ गरज आहे.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अरà¥à¤•à¤¾à¤ˆà¤µà¥à¤¹à¤œà¤šà¤¾ %sB घेणà¥à¤¯à¤¾à¤šà¥€ गरज आहे.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घà¥à¤¯à¤¾\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "काही अरà¥à¤•à¤¾à¤ˆà¤µà¥à¤¹à¤œ आणणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मधà¥à¤¯à¥‡ आधीच उघडलेलà¥à¤¯à¤¾ उगमातील उघडलेलà¥à¤¯à¤¾à¤²à¤¾ सोडून दà¥à¤¯à¤¾ किंवा वगळा\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आजà¥à¤žà¤¾ सà¥à¤Ÿà¥à¤¯à¤¾ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱà¥à¤¯à¤¾ आजà¥à¤žà¤¾ '%s' अयशसà¥à¤µà¥€.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "चाईलà¥à¤¡ पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ अयशसà¥à¤µà¥€"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "बिलà¥à¤¡à¥‡à¤ªà¤¸à¥ कशासाठी ते पडताळणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ किमान à¤à¤• पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडनà¥à¤¸à¥€ माहिती मिळवणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडनà¥à¤¸ नाहीत.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s पॅकेज न सापडलà¥à¤¯à¤¾à¤¨à¥‡ %s साठी %s डिपेंडनà¥à¤¸à¥€ पूरà¥à¤£ होऊ शकत नाही"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1230,30 +1225,30 @@ msgstr ""
"आवृतीची मागणी पूरà¥à¤£ करणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ %s पॅकेजची आवृतà¥à¤¤à¥€ उपलबà¥à¤§ नाही,तà¥à¤¯à¤¾à¤®à¥à¤³à¥‡ %s साठी %s "
"डिपेंडनà¥à¤¸à¥€ पूरà¥à¤£ होऊ शकत नाही"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबितà¥à¤µ %s साठी पूरà¥à¤£ होणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥: संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडनà¥à¤¸à¥€ पूरà¥à¤£ होणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडनà¥à¤¸à¥€à¤œ पूरà¥à¤£ होऊ शकत नाही."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडनà¥à¤¸à¥€à¤œ कà¥à¤°à¤¿à¤¯à¤¾ पूरà¥à¤£ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥ "
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® गटाला तांतà¥à¤°à¤¿à¤• मदत दिली:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1338,7 +1333,7 @@ msgstr ""
" apt.conf(5) पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾ पाने पहा.\n"
" हà¥à¤¯à¤¾ APT ला सà¥à¤ªà¤° काऊ पॉवरà¥à¤¸ आहेत\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1588,7 +1583,7 @@ msgstr "File %s/%s, %s पॅकेज मधलà¥à¤¯à¤¾ à¤à¤•à¤¾ वर पà¥
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1754,11 +1749,11 @@ msgid "File not found"
msgstr "फाईल सापडली नाही"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "सà¥à¤Ÿà¥…ट करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "बदलणà¥à¤¯à¤¾à¤šà¤¾ वेळ निशà¥à¤šà¤¿à¤¤ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
@@ -1767,34 +1762,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "अवैध यू आर à¤à¤², सà¥à¤¥à¤¾à¤¨à¤¿à¤• यू आर आय à¤à¤¸ सà¥à¤°à¥‚ होऊ नये यापासून //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "लॉग इन करत आहे"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "पिअर नाव सांगणà¥à¤¯à¤¾à¤¸/सापडणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "सà¥à¤¥à¤¾à¤¨à¤¿à¤• नाव सांगणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "सरà¥à¤µà¥à¤¹à¤° ने संबंध जोडणà¥à¤¯à¤¾à¤¸ नकार दिला व सांगितले: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले,यूजर असमरà¥à¤¥:"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले, पास असमरà¥à¤¥:"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1802,114 +1797,114 @@ msgstr ""
"पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ सरà¥à¤µà¥à¤¹à¤° निरà¥à¤¦à¥‡à¤¶à¤¿à¤¤ केला पण लॉगीन सà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ नाही, पà¥à¤°à¤¾à¤ªà¥à¤¤ केलेले ::ftp:: पà¥à¤°à¥‰à¤•à¥à¤¸à¥€à¤²à¥‰à¤—ीन "
"निररà¥à¤¥à¤• आहे."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले, '%s' लॉग इन सà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ आजà¥à¤žà¤¾à¤µà¤²à¥€ असमरà¥à¤¥:"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले: टाईप असमरà¥à¤¥:"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "वेळेअभावी संबंध जोडता येत नाही"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ संबंध जोडणी बंद केली"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "तà¥à¤°à¥à¤Ÿà¥€ वाचा"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "पà¥à¤°à¤¤à¤¿à¤¸à¤¾à¤§à¤¾à¤¨à¥‡ बफर भरà¥à¤¨ गेले."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "पà¥à¤°à¥‹à¤Ÿà¥‹à¤•à¥‰à¤² खराब à¤à¤¾à¤²à¥‡"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "लिहिणà¥à¤¯à¤¾à¤¤ तà¥à¤°à¥à¤Ÿà¥€"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "सॉकेट तयार करू शकत नाही"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "पॅसिवà¥à¤¹ सॉकेट जोडता येत नाही"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "गेटà¤à¤¡à¥à¤°à¥‡à¤¸à¤‡à¤¨à¤«à¥‹ लिसनिंग सॉकेट घेणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥ होते"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "सॉकेट चिकटवता येत नाही"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "सॉकेट वर à¤à¤•à¤¤à¤¾ येत नाही"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "सॉकेटचे नाव सांगता येत नाही"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "पोरà¥à¤Ÿ आजà¥à¤žà¤¾ पाठवता येत नाही/पोरà¥à¤Ÿ आजà¥à¤žà¤¾ पाठविणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "माहित नसलेला पतà¥à¤¤à¤¾ फॅमिली %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "ई.पी.आर.टी. चà¥à¤•à¤²à¥‡,सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "डेटा सॉकेट जोडणी वेळेअभावी तà¥à¤Ÿà¤²à¥€"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "जोडणी सà¥à¤µà¤¿à¤•à¤¾à¤°à¤£à¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "फाईल हॅश करणà¥à¤¯à¤¾à¤¤ तà¥à¤°à¥à¤Ÿà¥€"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले, फाईल मिळवणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "डेटा सॉकेट वेळेअभावी तà¥à¤Ÿà¤²à¥‡"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ %s सांगितले, डेटा सà¥à¤¥à¤¾à¤¨à¤¾à¤‚तरण चà¥à¤•à¤²à¥‡"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "पà¥à¤°à¤¶à¥à¤¨"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "जारी करणà¥à¤¯à¤¾à¤¸ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
@@ -2019,80 +2014,80 @@ msgstr "%s साठी पाईप उघडता येत नाही"
msgid "Read error from %s process"
msgstr "%s कà¥à¤°à¤¿à¤¯à¥‡à¤ªà¤¾à¤¸à¥‚न चूक वाचा"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "शीरà¥à¤·à¤•à¤¾à¤¸à¤¾à¤ à¥€ थांबले आहे...."
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u अकà¥à¤·à¤°à¤¾à¤‚वर à¤à¤• शीरà¥à¤·à¤• ओळ मिळाली"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "वाईट शीरà¥à¤·à¤• ओळ"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध पà¥à¤°à¤¤à¥à¤¤à¥à¤¯à¥à¤¤à¥à¤¤à¤° शीरà¥à¤·à¤• पाठविले"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध मजकूर-लांबी शीरà¥à¤·à¤• पाठविले "
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ अवैध मजकूर-विसà¥à¤¤à¤¾à¤° शीरà¥à¤·à¤• पाठविले"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "HTTP सरà¥à¤µà¥à¤¹à¤°à¤¨à¥‡ विसà¥à¤¤à¤¾à¤° तांतà¥à¤°à¤¿à¤• मदत जोडली"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "अपरिचित दिनांक पà¥à¤°à¤•à¤¾à¤°/सà¥à¤µà¤°à¥‚प "
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "चà¥à¤•à¤²à¥‡/असमरà¥à¤¥ निवड करा"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "जोडणी वेळेअभावी तà¥à¤Ÿà¤²à¥€"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "निरà¥à¤—त फाईल मधà¥à¤¯à¥‡ लिहिताना तà¥à¤°à¥à¤Ÿà¥€/चूक"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "फाईल मधà¥à¤¯à¥‡ लिहिणà¥à¤¯à¤¾à¤¤ चूक/तà¥à¤°à¥à¤Ÿà¥€"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "फाईल मधà¥à¤¯à¥‡ लिहिणà¥à¤¯à¤¾à¤¤ चूक/तà¥à¤°à¥à¤Ÿà¥€"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "सरà¥à¤µà¥à¤¹à¤° मधून वाचणà¥à¤¯à¤¾à¤¤ चूक. लांब शेवट आणि बंद à¤à¤¾à¤²à¥‡à¤²à¥€ जोडणी"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "सरà¥à¤µà¥à¤¹à¤° मधून वाचणà¥à¤¯à¤¾à¤¤ चूक"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "फाईल छोटी करणे असफल"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "चà¥à¤•à¥€à¤šà¤¾ शीरà¥à¤·à¤• डाटा"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "जोडणी अयशसà¥à¤µà¥€"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€"
@@ -2100,25 +2095,18 @@ msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€"
msgid "Can't mmap an empty file"
msgstr "रिकामी फाईल mmap करता येणार नाही"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap चे %lu बाईटसॠकरता येणार नाहीत"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2504,14 +2492,14 @@ msgstr "%s सà¥à¤¤à¥à¤°à¥‹à¤¤ सà¥à¤šà¥€à¤®à¤§à¥à¤¯à¥‡ %u रेषेवà
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "सà¥à¤¤à¥à¤°à¥‹à¤¤ सà¥à¤šà¥€ %s (विकà¥à¤°à¥‡à¤¤à¤¾ आयडी) मधà¥à¤¯à¥‡ %u वाईट/वà¥à¤¯à¤‚ग रेषा "
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2522,7 +2510,7 @@ msgstr ""
"गà¥à¤‚तागà¥à¤‚तीमà¥à¤³à¥‡/Pre-Depends पूरà¥à¤µ अवलंबित आवरà¥à¤¤à¤¨.हे नेहमीच वाईट असते, पण जर तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ ते खरोखर "
"करावयाचे असेल तर,APT::Force-LoopBreak परà¥à¤¯à¤¾à¤¯ कारà¥à¤¯à¤¾à¤¨à¥à¤µà¤¿à¤¤ करा."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2598,12 +2586,12 @@ msgstr "%s कारà¥à¤¯à¤ªà¤§à¥à¤¦à¤¤à¥€ योगà¥à¤¯ रीतीने
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया '%s' लेबल असलेली डिसà¥à¤• '%s' या डà¥à¤°à¤¾à¤‡à¤µà¥à¤¹à¤®à¤§à¥à¤¯à¥‡ ठेवा आणि à¤à¤¨à¥à¤Ÿà¤° कळ दाबा."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' पॅकेजींग पà¥à¤°à¤£à¤¾à¤²à¥€ सहायà¥à¤¯à¤•à¤¾à¤°à¥€ नाही"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "योगà¥à¤¯ असा पॅकेजिंग पà¥à¤°à¤£à¤¾à¤²à¥€ पà¥à¤°à¤•à¤¾à¤° निशà¥à¤šà¤¿à¤¤ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥ "
@@ -2741,19 +2729,19 @@ msgstr "IO तà¥à¤°à¥à¤Ÿà¥€ उगम निवडक संचयसà¥à¤¥à¤¾
msgid "rename failed, %s (%s -> %s)."
msgstr "पà¥à¤¨à¤°à¥à¤¨à¤¾à¤®à¤¾à¤‚कन अयशसà¥à¤µà¥€, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "à¤à¤®à¤¡à¥€à¥« बेरीज/MD5Sum जà¥à¤³à¤¤ नाही"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जà¥à¤³à¤¤ नाही"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "पà¥à¤¢à¥€à¤² कळ ओळखचिनà¥à¤¹à¤¾à¤‚साठी सारà¥à¤µà¤œà¤¨à¤¿à¤• कळ उपलबà¥à¤§ नाही:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2762,7 +2750,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधणà¥à¤¯à¤¾à¤¸ समरà¥à¤¥ नवà¥à¤¹à¤¤à¥‹. याचा अरà¥à¤¥ असाकी तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ हे पॅकेज सà¥à¤µà¤¹à¤¸à¥à¤¤à¥‡ "
"सà¥à¤¥à¤¿à¤°/निशà¥à¤šà¤¿à¤¤ करणà¥à¤¯à¤¾à¤šà¥€ गरज आहे(हरवलेलà¥à¤¯à¤¾ आरà¥à¤šà¤®à¥à¤³à¥‡) "
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2771,7 +2759,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधणà¥à¤¯à¤¾à¤¸ समरà¥à¤¥ नवà¥à¤¹à¤¤à¥‹. याचा अरà¥à¤¥ असाकी तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾à¤¹à¥‡ पॅकेज सà¥à¤µà¤¹à¤¸à¥à¤¤à¥‡ "
"सà¥à¤¥à¤¿à¤°/निशà¥à¤šà¤¿à¤¤ करणà¥à¤¯à¤¾à¤šà¥€ गरज आहे."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2779,7 +2767,7 @@ msgstr ""
"पॅकेज यादीची/सà¥à¤šà¥€à¤šà¥€ संचिका दूषित/खराब à¤à¤¾à¤²à¥‡à¤²à¥€ आहे. संचिका नाव नाही: पॅकेजकरीता कà¥à¤·à¥‡à¤¤à¥à¤°/"
"ठिकाण %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "आकार जà¥à¤³à¤¤à¤¨à¤¾à¤¹à¥€"
@@ -2912,76 +2900,99 @@ msgstr "%i विजोड संचिकांबरोबर %i माहिà
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "%s संरचना फाईल उघडत आहे"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "हॅश बेरीज जà¥à¤³à¤¤ नाही"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "%s संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ होत आहे"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s संरचित होत आहे"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s काढून टाकत आहे"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s संपूरà¥à¤£ काढून टाकले"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "संसà¥à¤¥à¤¾à¤ªà¤¨à¤¾-पशà¥à¤šà¤¾à¤¤ टà¥à¤°à¤¿à¤—र %s चालवत आहे"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "'%s' संचयिका गहाळ आहे"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s तयार करित आहे"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s सà¥à¤Ÿà¥‡/मोकळे करीत आहे "
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "%s संरचने साठी तयार करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¾à¤²à¥‡"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s ला काढून टाकणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ तयारी करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s संपूरà¥à¤£ काढून टाकणà¥à¤¯à¤¾à¤šà¥€ तयारी करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s संपूरà¥à¤£ काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "सतà¥à¤°à¤¨à¥‹à¤‚द लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3007,26 +3018,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "फाईल पॅच करता आली नाही"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "जोडणी अकाली बंद à¤à¤¾à¤²à¥€"
-#~ msgid "Could not patch file"
-#~ msgstr "फाईल पॅच करता आली नाही"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/nb.po b/po/nb.po
index 17096c85a..7688df3e7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-02-01 18:26+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -152,14 +152,9 @@ msgstr " Pakke låst til: "
msgid " Version table:"
msgstr " Versjonstabell:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s kompilert på %s %s\n"
@@ -658,7 +653,7 @@ msgstr "Klarte ikke å endre navnet på %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -819,11 +814,11 @@ msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil, sortering fullførte ikke"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Klarer ikke å låse nedlastingsmappa"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -854,8 +849,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -893,7 +888,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
@@ -902,7 +897,7 @@ msgstr "Klarte ikke å skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
@@ -1001,49 +996,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Utvalgt versjon %s (%s) for %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Kan ikke låse listemappa"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Bruk «apt-get autoremove» for å fjerne dem."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1061,43 +1056,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - «AllUpgrade» ødela noe"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Klarte ikke å finne oppgave %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke å finne pakken %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1105,7 +1100,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
"angi en løsning)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1117,122 +1112,122 @@ msgstr ""
"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Følgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Foreslåtte pakker:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Utført"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, problemløser ødela noe"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke å finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil «%s»\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1241,32 +1236,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1351,7 +1346,7 @@ msgstr ""
"for mer informasjon og flere innstillinger\n"
" Denne APT har kraften til en Superku.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1602,7 +1597,7 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1774,11 +1769,11 @@ msgid "File not found"
msgstr "Fant ikke fila"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -1787,34 +1782,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Logger inn"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Klarte ikke å fastslå navnet på motparten"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Klarte ikke å fastslå det lokale navnet"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Tjeneren nektet oss å kople til og sa: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER mislykkes, tjeneren sa: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS mislykkes, tjeneren sa: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1822,114 +1817,114 @@ msgstr ""
"En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::"
"ftp::ProxyLogin» er tomt."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE mislykkes, tjeneren sa: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Tidsavbrudd på forbindelsen"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Tjeneren lukket forbindelsen"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Lesefeil"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Et svar oversvømte bufferen."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokollødeleggelse"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivefeil"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Klarte ikke å opprette en sokkel"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Klarte ikke å koble til en passiv sokkel."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Klarte ikke å binde til sokkel"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Klarte ikke å lytte til sokkel"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Klarte ikke å avgjøre sokkelnavnet"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Klarte ikke å sende PORT-kommandoen"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Ukjent adressefamilie %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT mislykkes, tjeneren sa: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Klarte ikke å godta tilkoblingen"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Klarte ikke å hente fila, tjeneren sa «%s»"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Tidsavbrudd på datasokkelen"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Spørring"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Klarte ikke å starte"
@@ -2040,80 +2035,80 @@ msgstr "Klarte ikke å åpne rør for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Venter på hoder"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ødelagt hodelinje"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Tidsavbrudd på forbindelsen"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Klarte ikke forkorte fila %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Ødelagte hodedata"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Intern feil"
@@ -2121,12 +2116,12 @@ msgstr "Intern feil"
msgid "Can't mmap an empty file"
msgstr "Kan ikke utføre mmap på en tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke lage mmap av %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2135,13 +2130,6 @@ msgstr ""
"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
"Nåværende verdi: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2527,14 +2515,14 @@ msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Feil på %u i kildelista %s (selgers id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2545,7 +2533,7 @@ msgstr ""
"s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
"virkelig vil det, så bruk innstillingen APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2621,12 +2609,12 @@ msgstr "Metoden %s startet ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet «%s» støttes ikke"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2761,20 +2749,20 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2783,7 +2771,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2792,13 +2780,13 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Feil størrelse"
@@ -2931,76 +2919,99 @@ msgstr "Skrev %i poster med %i feile filer.\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Åpner oppsettsfila %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hashsummen stemmer ikke"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installerer %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Setter opp %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Fjernet %s fullstendig"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kjører etter-installasjonsutløser %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Mappa «%s» mangler"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Forbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Pakker ut %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Forbereder oppsett av %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Installerte %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Forbereder fjerning av %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Fjernet %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Forbereder å fullstendig slette %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3026,26 +3037,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Kunne ikke åpne fila %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen ble uventet stengt"
-#~ msgid "Could not patch file"
-#~ msgstr "Kunne ikke åpne fila %s"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/ne.po b/po/ne.po
index aac9721f2..5ea94d3a7 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -147,14 +147,9 @@ msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ पिन:"
msgid " Version table:"
msgstr " संसà¥à¤•à¤°à¤£ तालिका:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s को लागि %s %s, %s %s मा कमà¥à¤ªà¤¾à¤à¤² गरिà¤à¤•à¥‹ छ\n"
@@ -653,7 +648,7 @@ msgstr " %s मा %s पà¥à¤¨:नामकरण असफल भयो"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन तà¥à¤°à¥à¤Ÿà¤¿ रिजेकà¥à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - %s"
@@ -814,11 +809,11 @@ msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटà¥à¤¨ चाहदैछनॠत
msgid "Internal error, Ordering didn't finish"
msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿, आदेश समापà¥à¤¤ भà¤à¤•à¥‹ छैन"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेकà¥à¤Ÿà¥à¤°à¥€ तालà¥à¤šà¤¾ मारà¥à¤¨ असकà¥à¤·à¤®"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "सà¥à¤°à¥‹à¤¤à¤¹à¤°à¥à¤•à¥‹ सूचि पढà¥à¤¨ सकिà¤à¤¨ ।"
@@ -847,8 +842,8 @@ msgstr "अनपà¥à¤¯à¤¾à¤• गरिसके पछि थप डिसà¥à¤
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB अनपà¥à¤¯à¤¾à¤• गरिसके पछि डिसà¥à¤• खाली ठाउठखाली हà¥à¤¨à¥‡à¤› ।\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊठनिरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ सकिà¤à¤¨"
@@ -885,7 +880,7 @@ msgstr "परितà¥à¤¯à¤¾à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
msgid "Do you want to continue [Y/n]? "
msgstr "के तपाईठनिरनà¥à¤¤à¤°à¤¤à¤¾ दिन चाहनà¥à¤¹à¥à¤¨à¥à¤› [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तानà¥à¤¨ असफल भयो\n"
@@ -894,7 +889,7 @@ msgstr "%s %s तानà¥à¤¨ असफल भयो\n"
msgid "Some files failed to download"
msgstr "केही फाइलहरू डाउनलोड गरà¥à¤¨ असफल भयो"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समापà¥à¤¤ भयो र डाउनलोडमा मोड मातà¥à¤°à¥ˆ छ"
@@ -992,50 +987,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "%s को लागि चयन भà¤à¤•à¥‹ संसà¥à¤•à¤°à¤£ %s (%s)\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "सà¥à¤°à¥‹à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ सूची %s सà¥à¤¥à¤¿à¤° गरà¥à¤¨ सकिà¤à¤¨ "
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "अदà¥à¤¯à¤¾à¤µà¤§à¤¿à¤• आदेशले कà¥à¤¨à¥ˆ तरà¥à¤•à¤¹à¤°à¥‚ लिदैन"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "सूचि डाइरेकà¥à¤Ÿà¥à¤°à¥€ तालà¥à¤šà¤¾ मारà¥à¤¨ असफल"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "निमà¥à¤¨ नयाठपà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "निमà¥à¤¨ नयाठपà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1051,44 +1046,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "निमà¥à¤¨ सूचनाले अवसà¥à¤¥à¤¾à¤²à¤¾à¤ˆ हल गरà¥à¤¨ मदà¥à¤¦à¤¤ गरà¥à¤¨à¥‡à¤›: "
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿,समसà¥à¤¯à¤¾ हलकरà¥à¤¤à¤¾à¤²à¥‡ उतà¥à¤¤à¤® गà¥à¤£ भाà¤à¤šà¥à¤¯à¥‹ "
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿,सबै सà¥à¤¤à¤°à¤µà¥ƒà¤¦à¥à¤§à¤¿à¤²à¥‡ उतà¥à¤¤à¤® गà¥à¤£ नषà¥à¤Ÿ गरà¥à¤¦à¤›"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फेला पारà¥à¤¨ सकिà¤à¤¨ %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फेला पारà¥à¤¨ सकिà¤à¤¨ %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "दà¥à¤°à¤·à¥à¤Ÿà¤¬à¥à¤¯, रिजेकà¥à¤¸ '%s' को लागि %s चयन गरिदैछ\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "तर %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥à¤ªà¤°à¥à¤¯à¥‹"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "तपाईठयसलाई सà¥à¤§à¤¾à¤° गरà¥à¤¨ `apt-get -f install' चलाउन चाहनà¥à¤¹à¥à¤¨à¥à¤›:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1096,7 +1091,7 @@ msgstr ""
"नभेटिà¤à¤•à¤¾ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ । पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ बिना 'apt-get -f install' पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ( वा "
"समाधान निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥) ।"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1109,122 +1104,122 @@ msgstr ""
" वितरण अहिले समà¥à¤® सिरà¥à¤œà¤¨à¤¾\n"
" भà¤à¤•à¥‹ छैन वा आवगमन विनानै सरà¥à¤¯à¥‹ ।"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "भाà¤à¤šà¤¿à¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "निमà¥à¤¨ अतिरिकà¥à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "सà¥à¤à¤¾à¤µ दिà¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "सिफारिस गरिà¤à¤•à¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गणना गरिदैछ..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "असफल भयो"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "काम भयो"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿,समसà¥à¤¯à¤¾ हलकरà¥à¤¤à¤¾à¤²à¥‡ उतà¥à¤¤à¤® गà¥à¤£ भाà¤à¤šà¥à¤¯à¥‹ "
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि सà¥à¤°à¥‹à¤¤ तानà¥à¤¨ कमà¥à¤¤à¤¿à¤®à¤¾ à¤à¤‰à¤Ÿà¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤ªà¤°à¥à¤›"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि सà¥à¤°à¥‹à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ फेला पारà¥à¤¨ असफल भयो"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिलà¥à¤¯à¥ˆ डाउनलोड भà¤à¤•à¤¾ फाइलहरॠफडà¥à¤•à¤¾à¤‡à¤¦à¥ˆà¤› '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "तपाईठसंग %s मा परà¥à¤¯à¤¾à¤ªà¥à¤¤ खाली ठाऊठछैन"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "सà¥à¤°à¥‹à¤¤ संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ %sB/%sB पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ आवशà¥à¤¯à¤• छ ।\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "सà¥à¤°à¥‹à¤¤ संगà¥à¤°à¤¹à¤¹à¤°à¥à¤•à¥‹ %sB पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ आवशà¥à¤¯à¤• छ ।\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "सà¥à¤°à¥‹à¤¤ फडà¥à¤•à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥ %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "केही संगà¥à¤°à¤¹ फडà¥à¤•à¤¾à¤‰à¤¨ असफल भयो ।"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिलà¥à¤¯à¥ˆ अनपà¥à¤¯à¤¾à¤• गरिà¤à¤•à¤¾ सà¥à¤°à¥‹à¤¤à¤•à¥‹ अनपà¥à¤¯à¤¾à¤• फडà¥à¤•à¤¾à¤‡à¤¦à¥ˆà¤›\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनपà¥à¤¯à¤¾à¤• आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाà¤à¤šà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ यदि 'dpkg-dev' पà¥à¤¯à¤¾à¤•à¥‡à¤œ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो ।\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निरà¥à¤®à¤¾à¤£ आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "शाखा पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ असफल भयो"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाà¤à¤šà¥à¤¨ कमà¥à¤¤à¤¿à¤®à¤¾ à¤à¤‰à¤Ÿà¤¾ पà¥à¤¯à¤¾à¤•à¥‡à¤œ निरà¥à¤¦à¤·à¥à¤Ÿ गरà¥à¤¨à¥à¤ªà¤°à¥à¤›"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निरà¥à¤®à¤¾à¤£-निरà¥à¤­à¤°à¤¤à¤¾ सूचना पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कà¥à¤¨à¥ˆ निरà¥à¤®à¤¾à¤£à¤®à¤¾ आधारित हà¥à¤¦à¥ˆà¤¨ ।\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s को लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ हà¥à¤¨ सकेन किनभने पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s फेला पारà¥à¤¨ सकिà¤à¤¨"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,30 +1228,30 @@ msgstr ""
"%sको लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ हà¥à¤¨ सकेन किन भने पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s को कà¥à¤¨à¥ˆ उपलबà¥à¤§ संसà¥à¤•à¤°à¤£à¤²à¥‡ संसà¥à¤•à¤°à¤£ "
"आवशà¥à¤¯à¤•à¤¤à¤¾à¤¹à¤°à¥à¤²à¤¾à¤ˆ सनà¥à¤¤à¥à¤·à¥à¤Ÿ पारà¥à¤¨ सकेन "
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ पारà¥à¤¨ असफल भयो: सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s अति नयाठछ"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निरà¥à¤­à¤°à¤¤à¤¾ सनà¥à¤¤à¥à¤·à¥à¤Ÿ गरà¥à¤¨ असफल: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निरà¥à¤®à¤¾à¤£ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ सनà¥à¤¤à¥à¤·à¥à¤Ÿ गरà¥à¤¨ सकिà¤à¤¨ । "
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "निरà¥à¤®à¤¾à¤£ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ गरà¥à¤¨ असफल"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "समरà¥à¤¥à¤¿à¤¤ मोडà¥à¤¯à¥à¤²à¤¹à¤°à¥‚:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1339,7 +1334,7 @@ msgstr ""
"pages हेरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
" APT संग सà¥à¤ªà¤° काउ शकà¥à¤¤à¤¿à¤¹à¤°à¥‚ छ ।\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1589,7 +1584,7 @@ msgstr "फाइल %s/%s ले पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s मा à¤à¤‰à¤Ÿà¤¾ à
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1755,11 +1750,11 @@ msgid "File not found"
msgstr "फाइल फेला परेन "
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असफल भयो"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "परिमारà¥à¤œà¤¨ समय सेट असफल भयो"
@@ -1768,34 +1763,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "अवैध URl, सà¥à¤¥à¤¾à¤¨à¤¿à¤¯ URIS // संग सà¥à¤°à¥‚ हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "लगइन भइरहेछ"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "समान नाम निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "सà¥à¤¥à¤¾à¤¨à¤¿à¤¯ नाम निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "सरà¥à¤­à¤°à¤²à¥‡ जडान असà¥à¤µà¥€à¤•à¤¾à¤° गरà¥à¤¯à¥‹ र भनà¥à¤¯à¥‹: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾ असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "पास असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1803,114 +1798,114 @@ msgstr ""
"पà¥à¤°à¥‹à¤•à¥à¤¸à¥€ सरà¥à¤­à¤° निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ गरियो तर कà¥à¤¨à¥ˆ सà¥à¤•à¥à¤°à¤¿à¤«à¥à¤Ÿ लगइन भà¤à¤¨, Acquire::ftp::ProxyLogin "
"खाली छ ।"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "लगइन सà¥à¤•à¥à¤°à¤¿à¤«à¥à¤Ÿ आदेश '%s' असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "टाइप असफल भयो: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "जडान समय सकियो"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "सरà¥à¤­à¤°à¤²à¥‡ जडान बनà¥à¤¦ गरà¥à¤¯à¥‹"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿ पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "à¤à¤‰à¤Ÿà¤¾ पà¥à¤°à¤¤à¤¿à¤•à¥à¤°à¤¿à¤¯à¤¾à¤²à¥‡ बफर अधिपà¥à¤°à¤µà¤¾à¤¹ गरà¥à¤¯à¥‹"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "पà¥à¤°à¥‹à¤Ÿà¥‹à¤•à¤² दूषित"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿ लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "à¤à¤‰à¤Ÿà¤¾ सकेट सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ सकेन"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "डेटा सकेट जडान गरà¥à¤¨ सकिà¤à¤¨, जडान समय सकियो"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "निसà¥à¤•à¥à¤°à¤¿à¤¯ सकेट जडान गरà¥à¤¨ सकिà¤à¤¨"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo सà¥à¤¨à¥à¤¨à¥‡ सकेट पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "सकेट बाà¤à¤§à¥à¤¨ सकिà¤à¤¨"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "सकेटमा सà¥à¤¨à¥à¤¨ सकिà¤à¤¨"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "सकेट नाम निरà¥à¤§à¤¾à¤°à¤£ गरà¥à¤¨ सकिà¤à¤¨"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "पोरà¥à¤Ÿ आदेश पठाउन असकà¥à¤·à¤® भयो"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "अजà¥à¤žà¤¾à¤¤ ठेगाना परिवार %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "डेटा सकेटको जडान समय सकियो"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "जडान सà¥à¤µà¥€à¤•à¤¾à¤° गरà¥à¤¨ असकà¥à¤·à¤® भयो"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "समसà¥à¤¯à¤¾ दà¥à¤°à¥à¤¤à¤¾à¤¨à¥à¤µà¥‡à¤·à¤£ फाइल"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "फाइल तानà¥à¤¨ असकà¥à¤·à¤® भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹ '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "डेटा सकेट समय सकियो"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "डेटा सà¥à¤¥à¤¾à¤¨à¥à¤¤à¤°à¤£ असफल भयो, सरà¥à¤­à¤°à¤²à¥‡ भनà¥à¤¯à¥‹ '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "कà¥à¤µà¥‡à¤°à¥€"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "आहà¥à¤µà¤¾à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
@@ -2018,81 +2013,81 @@ msgstr "%s को लागि पाइप खोलà¥à¤¨ सकिà¤à¤¨"
msgid "Read error from %s process"
msgstr "%s पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾à¤¬à¤¾à¤Ÿ तà¥à¤°à¥à¤Ÿà¤¿ पढà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ "
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "हेडरहरà¥à¤•à¥‹ लागि परà¥à¤–िदैछ"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr " %u chars माथि à¤à¤•à¤² हेडर लाइन पà¥à¤°à¤¾à¤ªà¥à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "खराब हेडर लाइन"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP सरà¥à¤­à¤°à¤²à¥‡ अवैध जवाफ हेडर पठायो"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP सरà¥à¤­à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-लमà¥à¤¬à¤¾à¤ˆ हेडर पठायो"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP सरà¥à¤­à¤°à¤²à¥‡ अवैध सामगà¥à¤°à¥€-दायरा हेडर पठायो"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "HTTP सरà¥à¤­à¤° संग भाà¤à¤šà¤¿à¤à¤•à¥‹ दायरा समरà¥à¤¥à¤¨ छ"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "अजà¥à¤žà¤¾à¤¤ मिति ढाà¤à¤šà¤¾"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "असफल चयन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "जडान समय सकियो"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "निरà¥à¤—ात फाइलमा तà¥à¤°à¥à¤Ÿà¤¿ लेखिदैछ"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "फाइलमा तà¥à¤°à¥à¤Ÿà¤¿ लेखिदैछ"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "फाइलमा तà¥à¤°à¥à¤Ÿà¤¿ लेखिदैछ"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "सरà¥à¤­à¤°à¤¬à¤¾à¤Ÿ तà¥à¤°à¥à¤Ÿà¤¿ पढिदैछ । दूर गनà¥à¤¤à¤¬à¥à¤¯ बनà¥à¤¦ जडान"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "सरà¥à¤­à¤°à¤¬à¤¾à¤Ÿ तà¥à¤°à¥à¤Ÿà¤¿ पढिदैछ"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "फाइल %s लेखà¥à¤¨ असफल भयो"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "खराब हेडर डेटा"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "जडान असफल भयो"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿"
@@ -2100,25 +2095,18 @@ msgstr "आनà¥à¤¤à¤°à¤¿à¤• तà¥à¤°à¥à¤Ÿà¤¿"
msgid "Can't mmap an empty file"
msgstr "à¤à¤‰à¤Ÿà¤¾ खाली फाइल mmap बनाउन सकिà¤à¤¨"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu बाइटहरà¥à¤•à¥‹ mmap बनाउन सकिà¤à¤¨"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2505,14 +2493,14 @@ msgstr "सà¥à¤°à¥‹à¤¤ सूची %s भितà¥à¤° %u लाइनमा à¤
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "वैरà¥à¤ªà¥à¤¯ लाइन %u सà¥à¤°à¥‹à¤¤ सूचिमा %s (बिकà¥à¤°à¤¤à¤¾ आइडी)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2523,7 +2511,7 @@ msgstr ""
"हटाउनॠपरà¥à¤¨à¥‡à¤› । यो पà¥à¤°à¤¾à¤¯ नरामà¥à¤°à¥‹ हो, तर यदि तपाईठयो साà¤à¤šà¥à¤šà¥ˆ गरà¥à¤¨ चाहनà¥à¤¹à¥à¤¨à¥à¤› भने, APT::"
"Force-LoopBreak विकलà¥à¤ª सकà¥à¤°à¤¿à¤¯ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2598,12 +2586,12 @@ msgstr "विधि %s सही रà¥à¤ªà¤²à¥‡ सà¥à¤°à¥‚ हà¥à¤¨ सकà
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया डिसà¥à¤• लेबà¥à¤²: '%s' डà¥à¤°à¤¾à¤‡à¤­ '%s'मा घà¥à¤¸à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥ र इनà¥à¤Ÿà¤° थिचà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । "
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "पà¥à¤¯à¤¾à¤•à¤¿à¤™à¥à¤— पà¥à¤°à¤£à¤¾à¤²à¥€ '%s' समरà¥à¤¥à¤¿à¤¤ छैन"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "उपयà¥à¤•à¥à¤¤ पà¥à¤¯à¤¾à¤•à¤¿à¤™à¥à¤— पà¥à¤°à¤£à¤¾à¤²à¥€ पà¥à¤°à¤•à¤¾à¤° निरà¥à¤§à¤¾à¤°à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® भयो"
@@ -2737,20 +2725,20 @@ msgstr "सà¥à¤°à¥‹à¤¤ कà¥à¤¯à¤¾à¤¸ बचत गरà¥à¤¦à¤¾ IO तà¥à¤°à¥
msgid "rename failed, %s (%s -> %s)."
msgstr "पà¥à¤¨:नामकरण असफल गरियो, %s (%s -> %s) ।"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum मेल भà¤à¤¨"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भà¤à¤¨"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "निमà¥à¤¨ कà¥à¤žà¥à¤œà¥€ IDs को लागि कà¥à¤¨à¥ˆ सारà¥à¤µà¤œà¤¨à¤¿à¤• कà¥à¤žà¥à¤œà¥€ उपलबà¥à¤§ छैन:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2759,7 +2747,7 @@ msgstr ""
"%s पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि मैले फाइल सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨ सकिन । यसको मतलब तपाईà¤à¤²à¥‡ मà¥à¤¯à¤¾à¤¨à¥à¤²à¥à¤²à¥€ यो पà¥à¤¯à¤¾à¤•à¥‡à¤œ "
"निशà¥à¤šà¤¿à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । (arch हराà¤à¤°à¤¹à¥‡à¤•à¥‹ कारणले) "
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2768,13 +2756,13 @@ msgstr ""
"%s पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि मैले फाइल सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨ सकिन । यसको मतलब तपाईà¤à¤²à¥‡ मà¥à¤¯à¤¾à¤¨à¥à¤²à¥à¤²à¥€ यो पà¥à¤¯à¤¾à¤•à¥‡à¤œ "
"निशà¥à¤šà¤¿à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइलहरू दूषित भठ। पà¥à¤¯à¤¾à¤•à¥‡à¤œ %s को लागि कà¥à¤¨à¥ˆ फाइलनाम: फाà¤à¤Ÿ छैन ।"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "साइज मेल खाà¤à¤¨"
@@ -2906,76 +2894,98 @@ msgstr "मेल नखाà¤à¤•à¤¾ फाइल %i हरू संगै %i à
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "हराइरहेको फाइल %i हरू र मेल नखाà¤à¤•à¤¾ फाइल %i हरू संगै %i रेकरà¥à¤¡à¤¹à¤°à¥‚ लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "MD5Sum मेल भà¤à¤¨"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr " %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr " %s कनफिगर गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr " %s हटाइदैछ"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr " %s पूरà¥à¤£ रà¥à¤ªà¤²à¥‡ हटà¥à¤¯à¥‹"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "आंशिक सूचिहरà¥à¤•à¥‹ डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s हराइरहेछ ।"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr " %s तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr " %s अनपà¥à¤¯à¤¾à¤• गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr " %s कनफिगर गरà¥à¤¨ तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr " %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr " %s हटाउन तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr " %s हटà¥à¤¯à¥‹"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr " %s पूरà¥à¤£ रà¥à¤ªà¤²à¥‡ हटाउन तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr " %s पूरà¥à¤£ रà¥à¤ªà¤²à¥‡ हटà¥à¤¯à¥‹"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3001,27 +3011,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "फाइल %s खोलà¥à¤¨ सकिà¤à¤¨"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "जडान असमायिक बनà¥à¤¦ भयो"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "फाइल %s खोलà¥à¤¨ सकिà¤à¤¨"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/nl.po b/po/nl.po
index 31068dbd7..5f37143a6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-05-05 18:39+0200\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -145,14 +145,9 @@ msgstr " Pakketpin: "
msgid " Version table:"
msgstr " Versietabel:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s voor %s gecompileerd op %s %s\n"
@@ -658,7 +653,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -820,11 +815,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout, rangschikken is niet voltooid"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -855,8 +850,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -893,7 +888,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -902,7 +897,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -1003,34 +998,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1038,18 +1033,18 @@ msgstr ""
"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
"nodig:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
"nodig:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1067,45 +1062,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Kon taak %s niet vinden"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s is ingesteld voor handmatige installatie.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1113,7 +1108,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1124,119 +1119,119 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste één pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1245,7 +1240,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1254,32 +1249,32 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1368,7 +1363,7 @@ msgstr ""
"voor meer informatie en opties.\n"
" Deze APT heeft Super Koekrachten.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1624,7 +1619,7 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1794,11 +1789,11 @@ msgid "File not found"
msgstr "Bestand niet gevonden"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Status opvragen is mislukt"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -1807,34 +1802,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Bezig met aanmelden"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Kan de 'peer'-naam niet bepalen"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Kan de lokale naam niet bepalen"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Onze verbinding is door de server geweigerd met bericht: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER mislukt; bericht van server: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS mislukt; bericht van server: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1842,114 +1837,114 @@ msgstr ""
"Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::"
"ProxyLogin is leeg."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE mislukt; bericht van server: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Verbinding is verlopen"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Verbinding is verbroken door de server"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Leesfout"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Een reactie deed de buffer overlopen"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protocolcorruptie"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Schrijffout"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Kon geen socket aanmaken"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Kon de passieve socket niet verbinden."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo kon geen luistersocket verkrijgen"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Kon geen socket binden"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Kon niet op de socket niet luisteren"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Kon de socketnaam niet bepalen"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Kan PORT-commando niet verzenden"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Onbekende adresfamilie %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT is mislukt; bericht van server: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Datasocket verbinding is verlopen"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Kan bestand niet ophalen; bericht van server: %s"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Datasocket verliep"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Data transfer is mislukt, server zei: %s"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Zoekopdracht"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Aanroepen mislukt van "
@@ -2065,84 +2060,84 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Wegschrijven van bestand %s is mislukt"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Interne fout"
@@ -2150,25 +2145,18 @@ msgstr "Interne fout"
msgid "Can't mmap an empty file"
msgstr "Kan een leeg bestand niet mmappen"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kon van %lu bytes geen mmap maken"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2561,14 +2549,14 @@ msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2580,7 +2568,7 @@ msgstr ""
"vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie "
"te activeren."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2659,12 +2647,12 @@ msgstr ""
"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
"'enter' te drukken."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2805,20 +2793,20 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "herbenoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2827,7 +2815,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2836,7 +2824,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2844,7 +2832,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
@@ -2979,78 +2967,101 @@ msgstr ""
"%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
"bestanden\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Configuratiebestand %s wordt geopend"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash-som komt niet overeen"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "%s is geïnstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "%s wordt geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "%s wordt verwijderd"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s is volledig verwijderd"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Map '%s' is afwezig."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "%s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "%s wordt uitgepakt"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Configuratie van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s is geïnstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s is verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Volledige verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
"aangekoppeld?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3076,26 +3087,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Kon bestand niet patchen"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbinding werd voortijdig afgebroken"
-#~ msgid "Could not patch file"
-#~ msgstr "Kon bestand niet patchen"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/nn.po b/po/nn.po
index d39a3260c..8508266f1 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -149,14 +149,9 @@ msgstr " Pakke spikra til: "
msgid " Version table:"
msgstr " Versjonstabell:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert på %s %s\n"
@@ -654,7 +649,7 @@ msgstr "Klarte ikkje endra namnet på %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -817,11 +812,11 @@ msgstr "Nokre pakkar må fjernast, men fjerning er slått av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje låsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -850,8 +845,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -889,7 +884,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -898,7 +893,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -998,50 +993,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Klarte ikkje få status på kjeldepakkelista %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje låsa listekatalogen"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Dei følgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Dei følgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1057,44 +1052,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil. AllUpgrade øydelagde noko"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade øydelagde noko"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex «%s»\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1102,7 +1097,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
"ei løysing)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1114,123 +1109,123 @@ msgstr ""
"distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i «Incoming»."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Øydelagde pakkar"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Føreslåtte pakkar:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Tilrådde pakkar"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade øydelagde noko"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Må henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen «%s» mislukkast.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,31 +1234,31 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Støtta modular:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1347,7 +1342,7 @@ msgstr ""
"til apt-get(8), sources.list(5) og apt.conf(5).\n"
" APT har superku-krefter.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1595,7 +1590,7 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1766,11 +1761,11 @@ msgid "File not found"
msgstr "Fann ikkje fila"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Klarte ikkje få status"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -1779,34 +1774,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Loggar inn"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Klarte ikkje avgjera namnet på motparten"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Klarte ikkje avgjera det lokale namnet"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Tenaren nekta oss å kopla til, og sa: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER mislukkast, tenaren sa: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS mislukkast, tenaren sa: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1814,114 +1809,114 @@ msgstr ""
"Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
"«Acquire::ftp::ProxyLogin» er tomt."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Kommandoen «%s» i innlogginsskriptet mislukkast, tenaren sa: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE mislukkast, tenaren sa: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Tidsavbrot på samband"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Tenaren lukka sambandet"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Lesefeil"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Eit svar flaumde over bufferen."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokolløydeleggjing"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivefeil"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Klarte ikkje oppretta sokkel"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot på sambandet"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Klarte ikkje kopla til passiv sokkel."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Klarte ikkje binda til sokkel"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Klarte ikkje lytta til sokkel"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Klarte ikkje avgjera sokkelnamnet"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Klarte ikkje senda PORT-kommandoen"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Ukjend adressefamilie %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT mislukkast, tenaren sa: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Tidsavbrot på tilkopling til datasokkel"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Klarte ikkje henta fila, tenaren sa «%s»"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Tidsavbrot på datasokkelen"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Dataoverføringa mislukkast, tenaren sa «%s»"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Spørjing"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Klarte ikkje starta "
@@ -2030,81 +2025,81 @@ msgstr "Klarte ikkje opna røyr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil frå %s-prosessen"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Ventar på hovud"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Øydelagd hovudlinje"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Tidsavbrot på sambandet"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Feil ved lesing frå tenaren"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Klarte ikkje skriva fila %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Øydelagde hovuddata"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Intern feil"
@@ -2112,25 +2107,18 @@ msgstr "Intern feil"
msgid "Can't mmap an empty file"
msgstr "Kan ikkje utføra mmap på ei tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikkje laga mmap av %lu byte"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2517,14 +2505,14 @@ msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2536,7 +2524,7 @@ msgstr ""
"om du verkeleg vil gjera det, kan du bruka innstillinga «APT::Force-"
"LoopBreak»."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2615,12 +2603,12 @@ msgstr ""
" «%s»\n"
"i stasjonen «%s» og trykk Enter.\n"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet «%s» er ikkje støtta"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2755,20 +2743,20 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2777,7 +2765,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2785,14 +2773,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Feil storleik"
@@ -2924,76 +2912,97 @@ msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Opnar oppsettsfila %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Feil MD5-sum"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Koplar til %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Opnar %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Klarte ikkje fjerna %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Listekatalogen %spartial manglar."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Tilrådingar"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3019,27 +3028,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "Klarte ikkje opna fila %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Sambandet vart uventa stengd"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "Klarte ikkje opna fila %s"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/pl.po b/po/pl.po
index c24f5a656..30e5741ab 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.23.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-09-27 03:42+0100\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -149,14 +149,9 @@ msgstr " Sposób przypięcia: "
msgid " Version table:"
msgstr " Tabela wersji:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s dla %s skompilowany %s %s\n"
@@ -657,7 +652,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -818,11 +813,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
msgid "Internal error, Ordering didn't finish"
msgstr "Błąd wewnętrzny, sortowanie niezakończone"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nie udało się odczytać list źródeł."
@@ -853,8 +848,8 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
@@ -891,7 +886,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Kontynuować [T/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
@@ -900,7 +895,7 @@ msgstr "Nie udało się pobrać %s %s\n"
msgid "Some files failed to download"
msgstr "Nie udało się pobrać niektórych plików"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
@@ -1000,34 +995,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Wybrano wersjÄ™ %s (%s) dla %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga żadnych argumentów"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Nie udało się zablokować katalogu list"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1035,18 +1030,18 @@ msgstr ""
"Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
"wymagane:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej "
"wymagane.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1064,43 +1059,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Nie udało się odnaleźć zadania %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1108,7 +1103,7 @@ msgstr ""
"Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
"pakietów (lub podać rozwiązanie)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1120,119 +1115,119 @@ msgstr ""
"w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"PrzychodzÄ…ce\")."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Pakiety sÄ… uszkodzone"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Nie udało się"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz źródło %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
"zależności dla budowania"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności dla budowania.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1241,7 +1236,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1250,32 +1245,32 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udało się spełnić zależności %s od %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udało się spełnić zależności dla budowania %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1359,7 +1354,7 @@ msgstr ""
"apt-get(8), sources.list(5) i apt.conf(5).\n"
" Ten APT ma moce Super Krowy.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1615,7 +1610,7 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1784,11 +1779,11 @@ msgid "File not found"
msgstr "Nie odnaleziono pliku"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -1797,34 +1792,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Logowanie siÄ™"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nie można określić nazwy zdalnego systemu"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nie udało się określić nazwy lokalnego systemu"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1832,116 +1827,116 @@ msgstr ""
"Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, "
"Acquire::ftp::ProxyLogin jest puste."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: %"
"s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Przekroczenie czasu połączenia"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Serwer zamknął połączenie"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "BÅ‚Ä…d odczytu"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Odpowiedź przepełniła bufor."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Naruszenie zasad protokołu"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "BÅ‚Ä…d zapisu"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nie udało się utworzyć gniazda"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nie udało się połączyć pasywnego gniazda."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nie udało się przyłączyć gniazda"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Nie udało się nasłuchiwać na gnieździe"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Nie udało się określić nazwy gniazda"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Nie można wysłać polecenia PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Nieznana rodzina adresów %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Przekroczony czas połączenia gniazda danych"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Nie udało się przyjąć połączenia"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udało się obliczyć skrótu pliku"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Nie można pobrać pliku, odpowiedź serwera: %s"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Przekroczony czas oczekiwania na dane"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Info"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nie można wywołać "
@@ -2055,80 +2050,80 @@ msgstr "Nie udało się otworzyć potoku dla %s"
msgid "Read error from %s process"
msgstr "BÅ‚Ä…d odczytu z procesu %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagłówki"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Nieprawidłowa linia nagłówka"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Operacja select nie powiodła się"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Przekroczenie czasu połączenia"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Błąd przy pisaniu do pliku wyjściowego"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "BÅ‚Ä…d przy pisaniu do pliku"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "BÅ‚Ä…d przy pisaniu do pliku"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "BÅ‚Ä…d czytania z serwera"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Nie udało się uciąć zawartości pliku %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Błędne dane nagłówka"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Połączenie nie udało się"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Błąd wewnętrzny"
@@ -2136,12 +2131,12 @@ msgstr "Błąd wewnętrzny"
msgid "Can't mmap an empty file"
msgstr "Nie można wykonać mmap na pustym pliku"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udało się wykonać mmap %lu bajtów"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2150,13 +2145,6 @@ msgstr ""
"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
"Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2543,14 +2531,14 @@ msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2562,7 +2550,7 @@ msgstr ""
"nic dobrego, ale jeśli naprawdę chcesz to zrobić, włącz opcję APT::Force-"
"LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2638,12 +2626,12 @@ msgstr "Metoda %s nie uruchomiła się poprawnie"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakietów \"%s\" nie jest obsługiwany"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
@@ -2779,19 +2767,19 @@ msgstr "BÅ‚Ä…d wejÅ›cia/wyjÅ›cia przy zapisywaniu podrÄ™cznego magazynu źródeÅ
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Błędna suma MD5"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2800,7 +2788,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2809,14 +2797,14 @@ 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:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Błędny rozmiar"
@@ -2951,78 +2939,101 @@ msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Otwieranie pliku konfiguracyjnego %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Błędna suma kontrolna"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Instalowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Konfigurowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Całkowicie usunięto %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Uruchamianie wyzwalacza post-installation %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Brakuje katalogu \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Przygotowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Rozpakowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Przygotowanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Zainstalowany %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Przygotowanie do usunięcia %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Usunięto %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Przygotowanie do całkowitego usunięcia %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Całkowicie usunięto %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
"zamontowane?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr "Uruchamianie dpkg"
@@ -3053,30 +3064,20 @@ msgstr ""
msgid "Not locked"
msgstr "Nie zablokowany"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nie udało się nałożyć łatki na plik"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Połączenie zostało zamknięte przedwcześnie"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
#~ msgid "No source package '%s' picking '%s' instead\n"
#~ msgstr "Brak pakietu źródłowego \"%s\", wybieranie \"%s\" zamiast niego\n"
-#~ msgid "Could not patch file"
-#~ msgstr "Nie udało się nałożyć łatki na plik"
-
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/pt.po b/po/pt.po
index 8af0a73c8..3eff616bd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-09-09 20:54+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -145,14 +145,9 @@ msgstr " Marcação do Pacote: "
msgid " Version table:"
msgstr " Tabela de Versão:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
@@ -653,7 +648,7 @@ msgstr "Falhou renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -814,11 +809,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -849,8 +844,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -887,7 +882,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
@@ -896,7 +891,7 @@ msgstr "Falhou obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
@@ -996,34 +991,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Impossível criar acesso exclusivo ao directório de listas"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1031,18 +1026,18 @@ msgstr ""
"Os seguintes pacotes foram instalados automaticamente e já não são "
"necessários:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Os seguintes pacotes foram instalados automaticamente e já não são "
"necessários:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Utilize 'apt-get autoremove' para os remover."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1060,43 +1055,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover estragou coisas"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Não foi possível encontrar a tarefa %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s está definido para ser instalado manualmente.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1099,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1116,119 +1111,119 @@ msgstr ""
"distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
"criados ou foram movidos do Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Não foi possível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1237,7 +1232,7 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1246,32 +1241,32 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
"demasiado novo"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1358,7 +1353,7 @@ msgstr ""
"sources.list(5) e apt.conf(5)\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1612,7 +1607,7 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1780,11 +1775,11 @@ msgid "File not found"
msgstr "Ficheiro não encontrado"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -1793,34 +1788,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI inválido, URIs locais não devem começar por //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "A identificar-se no sistema"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Não foi possível determinar o nome do posto"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Não foi possível determinar o nome local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "O servidor recusou a ligação e respondeu: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER falhou, o servidor respondeu: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS falhou, o servidor respondeu: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1828,114 +1823,114 @@ msgstr ""
"Foi especificado um servidor de proxy mas não um script de login, Acquire::"
"ftp::ProxyLogin está vazio."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE falhou, o servidor respondeu: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Foi atingido o tempo limite de ligação"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "O servidor fechou a ligação"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Erro de leitura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Uma resposta sobrecarregou o buffer"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Erro de escrita"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Não foi possível criar um socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível ligar socket de dados, a ligação expirou"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Não foi possível ligar socket passivo."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Não foi possível fazer o bind a um socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Não foi possível executar listen no socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Não foi possível determinar o nome do socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Não foi possível enviar o comando PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Família de endereços %u desconhecida (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT falhou, o servidor respondeu: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Ligação de socket de dados expirou"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Expirou o tempo do socket de dados"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "A transferência de dados falhou, o servidor respondeu '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Pesquisa"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Não foi possível invocar "
@@ -2050,80 +2045,80 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "A aguardar por cabeçalhos"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte de range errado"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "A selecção falhou"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "O tempo da ligação expirou"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Erro ao escrever para o ficheiro de saída"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Erro ao escrever para ficheiro"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Erro ao escrever para o ficheiro"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Falhou truncar o ficheiro"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "A ligação falhou"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Erro interno"
@@ -2131,25 +2126,18 @@ msgstr "Erro interno"
msgid "Can't mmap an empty file"
msgstr "Não é possível fazer mmap a um ficheiro vazio"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2539,14 +2527,14 @@ msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2558,7 +2546,7 @@ msgstr ""
"normalmente é mau, mas se você quer realmente fazer isso, active a opção "
"APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2638,12 +2626,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento adequado"
@@ -2785,21 +2773,21 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum não coincide"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2809,7 +2797,7 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2818,7 +2806,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2826,7 +2814,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
@@ -2961,78 +2949,101 @@ msgstr ""
"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
"coincidentes\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "A abrir o ficheiro de configuração %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Código de verificação hash não coincide"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "A instalar %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Remoção completa de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "A correr o 'trigger' de pós-instalação %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta o directório '%s'"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "A desempacotar %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "A preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "A preparar a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A preparar para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
"montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3058,26 +3069,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Ligação encerrada prematuramente"
-#~ msgid "Could not patch file"
-#~ msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a53089695..6ca0c52ff 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: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -147,14 +147,9 @@ msgstr " Pacote alfinetado (\"pin\"): "
msgid " Version table:"
msgstr " Tabela de versão:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
@@ -658,7 +653,7 @@ msgstr "Falhou ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -820,11 +815,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
@@ -856,8 +851,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -894,7 +889,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Você quer continuar [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
@@ -903,7 +898,7 @@ msgstr "Falhou ao buscar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -1001,34 +996,34 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Versão selecionada %s (%s) para %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Impossível criar trava no diretório de listas"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1036,18 +1031,18 @@ msgstr ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' para removê-los."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1065,43 +1060,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "A informação a seguir pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover quebrou coisas"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou coisas"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Impossível achar tarefa %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1109,7 +1104,7 @@ msgstr ""
"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1121,117 +1116,117 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram\n"
"criados ainda ou foram retirados da \"Incoming\"."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1240,7 +1235,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,32 +1244,32 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1360,7 +1355,7 @@ msgstr ""
"para mais informações e opções.\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1615,7 +1610,7 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1783,11 +1778,11 @@ msgid "File not found"
msgstr "Arquivo não encontrado"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -1796,34 +1791,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI inválida, URIs locais não devem iniciar com //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Efetuando login"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Impossível determinar o nome do ponto"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Impossível determinar o nome local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "O servidor recusou a conexão e disse: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER falhou, servidor disse: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS falhou, servidor disse: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1831,114 +1826,114 @@ msgstr ""
"Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::"
"ProxyLogin está vazio."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Comando de script de login '%s' falhou, servidor disse: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE falhou, servidor disse: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Conexão expirou"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Servidor fechou a conexão"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Erro de leitura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Uma resposta sobrecarregou o buffer"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Erro de escrita"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Não foi possível criar um socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Não foi possível conectar um socket de dados, conexão expirou"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Não foi possível conectar um socket passivo."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Não foi possível fazer \"bind\" de um socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Não foi possível ouvir no socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Não foi possível determinar o nome do socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Impossível enviar o comando PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Família de endereços %u desconhecida (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT falhou, servidor disse: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Conexão do socket de dados expirou"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema criando o hash do arquivo"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Impossível obter arquivo, servidor disse '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Socket de dados expirou"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Transferência de dados falhou, servidor disse '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Pesquisa"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Impossível invocar "
@@ -2053,80 +2048,80 @@ msgstr "Não foi possível abrir \"pipe\" para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Erro escrevendo para arquivo de saída"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Erro escrevendo para arquivo"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Erro escrevendo para o arquivo"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Falhou ao truncar arquivo"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Erro interno"
@@ -2134,25 +2129,18 @@ msgstr "Erro interno"
msgid "Can't mmap an empty file"
msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2541,14 +2529,14 @@ msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2560,7 +2548,7 @@ msgstr ""
"é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
"LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2638,12 +2626,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
@@ -2784,19 +2772,19 @@ msgstr "Erro de E/S ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2806,7 +2794,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2815,7 +2803,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2823,7 +2811,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
"\" para o pacote %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2958,76 +2946,99 @@ msgstr ""
"Gravados %i registros com %i arquivos faltando e %i arquivos que não "
"combinam\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Abrindo arquivo de configuração %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum incorreto"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Removendo %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "%s completamente removido"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando gatilho pós-instalação %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Diretório '%s' está faltando"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Desempacotando %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparando para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparando para a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparando para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3053,26 +3064,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Não foi possível aplicar o patch"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexão encerrada prematuramente"
-#~ msgid "Could not patch file"
-#~ msgstr "Não foi possível aplicar o patch"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/ro.po b/po/ro.po
index ab812401f..776668d7e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -148,14 +148,9 @@ msgstr " Pachet ales special: "
msgid " Version table:"
msgstr " Tabela de versiuni:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pentru %s compilat la %s %s\n"
@@ -660,7 +655,7 @@ msgstr "Eșec la redenumirea lui %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -821,11 +816,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -855,8 +850,8 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
@@ -894,7 +889,7 @@ msgstr "Renunțare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreți să continuați [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
@@ -903,7 +898,7 @@ msgstr "Eșec la aducerea lui %s %s\n"
msgid "Some files failed to download"
msgstr "Descărcarea unor fișiere a eșuat"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
@@ -1001,50 +996,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
# XXX: orice sugestie este bine-venită
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1063,43 +1058,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Nu s-a putut găsi sarcina %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1107,7 +1102,7 @@ msgstr ""
"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
"(sau oferiți o altă soluție)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1120,118 +1115,118 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Eșec"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveți suficient spațiu în %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
"înglobate"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1240,7 +1235,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,32 +1244,32 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1361,7 +1356,7 @@ msgstr ""
"pentru mai multe informații și opțiuni.\n"
" Acest APT are puterile unei Super Vaci.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1616,7 +1611,7 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1788,11 +1783,11 @@ msgid "File not found"
msgstr "Fișier negăsit"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "EÈ™ec la „statâ€"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -1801,34 +1796,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Se autentifică"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nu se poate detecta numele perechii"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nu s-a putut detecta numele local"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Serverul a refuzat conexiunea și a spus: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "„USER†a eșuat, serverul a spus: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "„PASS†a eșuat, serverul a spus: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1836,116 +1831,116 @@ msgstr ""
"Un server proxy a fost precizat, dar nu există nici un script de conectare, "
"Acquire::ftp::ProxyLogin este gol."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Scriptul „%s†cu comenzile de conectare a eșuat, serverul a spus: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "„TYPE†a eșuat, serverul a spus: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Timpul de conectare a expirat"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Serverul a închis conexiunea"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Eroare de citire"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Un răspuns a depășit zona de tampon."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protocol corupt"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Eroare de scriere"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nu s-a putut crea un socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
"Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
"expirat"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nu s-a putut realiza conectarea la un socket pasiv"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "„getaddrinfo†n-a reușit să obțină un socket de ascultare"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nu s-a putut realiza asocierea la un socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Nu s-a putut asculta pe socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Nu s-a putut detecta numele socket-ului"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Nu s-a putut trimite comanda PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Familie de adrese necunoscută %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "„EPRT†a eșuat, serverul a spus: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Timpul de conectare la socket-ul de date expirat"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Nu s-a putut accepta conexiune"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la calcularea dispersiei pentru fișierul"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Nu s-a putut aduce fiÈ™ierul, serverul a spus „%sâ€"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Timp expirat pentru socket-ul de date"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Transferul de date a eșuat, serverul a spus: '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Interogare"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nu s-a putut invoca"
@@ -2060,81 +2055,81 @@ msgstr "Nu s-a putut deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "În așteptarea antetelor"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S-a primit o singură linie de antet de peste %u caractere"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Acest server HTTP are un suport defect de intervale"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Format dată necunoscut"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Selecția a eșuat"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Eroare la scrierea fișierului de rezultat"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Eroare la scrierea în fișier"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fișierul"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Eroare la citirea de la server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Eșec la trunchierea fișierului"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Conectare eșuată"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Eroare internă"
@@ -2142,25 +2137,18 @@ msgstr "Eroare internă"
msgid "Can't mmap an empty file"
msgstr "Nu s-a putut executa „mmap†cu un fișier gol"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nu s-a putut face mmap cu %lu octeți"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2548,14 +2536,14 @@ msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2567,7 +2555,7 @@ msgstr ""
"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::"
"Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2644,12 +2632,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistemul de pachete '%s' nu este suportat"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
@@ -2791,21 +2779,21 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eșuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2814,7 +2802,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2823,7 +2811,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2831,7 +2819,7 @@ msgstr ""
"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
@@ -2966,77 +2954,100 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Se deschide fișierul de configurare %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Nepotrivire la suma de căutare"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Se instalează %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Se configurează %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Se șterge %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Șters complet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Se rulează declanșatorul post-instalare %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Directorul „%s†lipsește."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Se pregătește %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Se despachetează %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Se pregătește configurarea %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Instalat %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Se pregătește ștergerea lui %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Șters %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Se pregătește ștergerea completă a %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3062,26 +3073,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nu s-a putut peteci fișierul"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexiune închisă prematur"
-#~ msgid "Could not patch file"
-#~ msgstr "Nu s-a putut peteci fișierul"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/ru.po b/po/ru.po
index 2b9d85e96..ea2ba0b9c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,4 +1,4 @@
-# translation of ru.po to Russian
+# translation of apt_0.7.25_ru.po to Russian
# Russian messages for the apt suite.
#
# Vadim Kutchin <amadis@chemi.komisc.ru>, 2002.
@@ -8,13 +8,13 @@
# Dmitry Astapov <adept@umc.com.ua>, 2004.
# Dmitry Astapov <adept@despammed.com>, 2004.
# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006, 2007, 2008.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.7.21\n"
+"Project-Id-Version: apt 0.7.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-05-03 22:01+0400\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"PO-Revision-Date: 2010-01-08 09:47+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -154,14 +154,9 @@ msgstr " ФикÑатор пакета: "
msgid " Version table:"
msgstr " Таблица верÑий:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s Ð´Ð»Ñ %s Ñкомпилирован %s %s\n"
@@ -239,9 +234,8 @@ msgstr ""
"ПодробноÑти в Ñправочных Ñтраницах apt-cache(8) и apt.conf(5).\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Задайте Ð¸Ð¼Ñ Ð´Ð»Ñ Ñтого диÑка, например 'Debian 2.1r1 Disk 1'"
+msgstr "Задайте Ð¸Ð¼Ñ Ð´Ð»Ñ Ñтого диÑка, например 'Debian 5.0.3 Disk 1'"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
@@ -452,6 +446,10 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB уÑтарела, попытка обновить %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
+#| msgid ""
+#| "DB format is invalid. If you upgraded from an older version of apt, "
+#| "please remove and re-create the database."
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
@@ -663,7 +661,7 @@ msgstr "Ðе удалоÑÑŒ переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компилÑции регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ - %s"
@@ -829,11 +827,11 @@ msgstr "Пакеты необходимо удалить, но удаление
msgid "Internal error, Ordering didn't finish"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, Ordering не завершилаÑÑŒ"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Ðевозможно заблокировать каталог, куда ÑкладываютÑÑ Ñкачиваемые файлы"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Ðе читаетÑÑ Ð¿ÐµÑ€ÐµÑ‡ÐµÐ½ÑŒ иÑточников."
@@ -866,8 +864,8 @@ msgstr ""
"ПоÑле данной операции, объём занÑтого диÑкового проÑтранÑтва уменьшитÑÑ Ð½Ð° %"
"sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ðе удалоÑÑŒ определить количеÑтво Ñвободного меÑта в %s"
@@ -906,7 +904,7 @@ msgstr "Ðварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ðе удалоÑÑŒ получить %s %s\n"
@@ -915,7 +913,7 @@ msgstr "Ðе удалоÑÑŒ получить %s %s\n"
msgid "Some files failed to download"
msgstr "Ðекоторые файлы Ñкачать не удалоÑÑŒ"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только Ñкачивание\", и Ñкачивание завершено"
@@ -1000,7 +998,7 @@ msgstr "Уже уÑтановлена ÑÐ°Ð¼Ð°Ñ Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ %s.\n"
#: cmdline/apt-get.cc:1227
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Релиз '%s' Ð´Ð»Ñ '%s' не найден"
+msgstr "ВыпуÑк '%s' Ð´Ð»Ñ '%s' не найден"
#: cmdline/apt-get.cc:1229
#, c-format
@@ -1013,49 +1011,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана верÑÐ¸Ñ %s (%s) Ð´Ð»Ñ %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "ИгнорируетÑÑ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ '%s' пакета '%s'"
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "ИгнорируетÑÑ Ð½ÐµÐ´Ð¾Ñтупный выпуÑк '%s' пакета '%s'"
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1342
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Ðе удалоÑÑŒ получить атрибуты ÑпиÑка пакетов иÑходного кода %s"
+msgstr "ИÑпользуетÑÑ '%s' в качеÑтве иÑходного пакета вмеÑто '%s'\n"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Ðевозможно заблокировать каталог Ñо ÑпиÑками пакетов"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Ðе предполагалоÑÑŒ удалÑÑ‚ÑŒ stuff, невозможно запуÑтить AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Следующие пакеты уÑтанавливалиÑÑŒ автоматичеÑки и больше не требуютÑÑ:"
-#: cmdline/apt-get.cc:1503
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1515
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "Следующие пакеты уÑтанавливалиÑÑŒ автоматичеÑки и больше не требуютÑÑ:"
+msgstr "%lu пакетов было уÑтановлены автоматичеÑки и больше не требуютÑÑ.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Ð”Ð»Ñ Ð¸Ñ… ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ñпользуйте 'apt-get autoremove'."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1073,45 +1071,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ, возможно, поможет вам:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, AutoRemover вÑÑ‘ поломал"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, AllUpgrade вÑÑ‘ поломал"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Ðе удалоÑÑŒ найти задачу %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Ðе удалоÑÑŒ найти пакет %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, выбираетÑÑ %s из-за регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ %s\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s уÑтановлен вручную.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, длÑ иÑправлениÑ Ñтих ошибок вы захотите воÑпользоватьÑÑ `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1119,7 +1117,7 @@ msgstr ""
"Ðеудовлетворённые завиÑимоÑти. ПопытайтеÑÑŒ выполнить 'apt-get -f install', "
"не ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ Ð¸Ð¼ÐµÐ½Ð¸ пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1130,118 +1128,118 @@ msgstr ""
"или же иÑпользуете неÑтабильную верÑию диÑтрибутива, где запрошенные вами\n"
"пакеты ещё не Ñозданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Будут уÑтановлены Ñледующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Предлагаемые пакеты:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "РаÑчёт обновлений... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ðеудачно"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, решатель проблем вÑÑ‘ поломал"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, иÑходный код которого необходимо получить"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ðевозможно найти пакет Ñ Ð¸Ñходным кодом Ð´Ð»Ñ %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ПропуÑкаем уже Ñкачанный файл '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ÐедоÑтаточно меÑта в %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ðеобходимо получить %sб/%sб архивов иÑходного кода.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ðеобходимо получить %sб архивов иÑходного кода.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Получение иÑходного кода %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Ðекоторые архивы не удалоÑÑŒ получить."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "ПропуÑкаетÑÑ Ñ€Ð°Ñпаковка уже раÑпакованного иÑходного кода в %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда раÑпаковки '%s' завершилаÑÑŒ неудачно.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, уÑтановлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда Ñборки '%s' завершилаÑÑŒ неудачно.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Порождённый процеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ завиÑимоÑтей Ð´Ð»Ñ Ñборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ðевозможно получить информацию о завиÑимоÑÑ‚ÑÑ… Ð´Ð»Ñ Ñборки %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет завиÑимоÑтей Ð´Ð»Ñ Ñборки.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1250,7 +1248,7 @@ msgstr ""
"ЗавиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1259,33 +1257,32 @@ msgstr ""
"ЗавиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ %s не может быть удовлетворена, поÑкольку ни одна из "
"верÑий пакета %s не удовлетворÑет требованиÑм"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ðе удалоÑÑŒ удовлетворить завиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s: УÑтановленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ðевозможно удовлетворить завиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ЗавиÑимоÑти Ð´Ð»Ñ Ñборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Обработка завиÑимоÑтей Ð´Ð»Ñ Ñборки завершилаÑÑŒ неудачно"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2699
-#, fuzzy
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1355,31 +1352,34 @@ msgstr ""
"\n"
"Параметры:\n"
" -h Ñтот текÑÑ‚\n"
-" -q выводить ÑообщениÑ, пригодные Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи в файл журнала,\n"
-" не выводить индикатор хода работы\n"
-" -qq выводить только ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках\n"
+" -q показывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ работе, не выводить индикатор хода работы\n"
+" -qq показывать только ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках\n"
" -d только Ñкачать - ÐЕ уÑтанавливать и не раÑпаковывать архивы\n"
" -s не выполнÑÑ‚ÑŒ дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° Ñамом деле, только Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹\n"
" -y отвечать \"Да\" на вÑе вопроÑÑ‹, Ñами вопроÑÑ‹ при Ñтом не выводить\n"
" -f попытатьÑÑ Ð¸Ñправить ÑиÑтему, имеющую Ñломанные завиÑимоÑти\n"
-" -m продолжать, даже еÑли меÑтоположение архивов неизвеÑтно\n"
+" -m попытатьÑÑ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ, даже еÑли архивы не найдены\n"
" -u показывать также ÑпиÑок обновлÑемых пакетов\n"
" -b Ñобрать пакет из иÑходного кода поÑле его получениÑ\n"
-" -V показать полные номера верÑий\n"
+" -V показывать полные номера верÑий\n"
" -c=? читать указанный файл наÑтройки\n"
-" -o=? задать значение произвольному параметру наÑтройки, например, -o dir::"
-"cache=/tmp\n"
-"Справочные Ñтраницы apt-get(8), sources.list(5) и apt.conf(5)\n"
-"Ñодержат подробную информацию и опиÑание параметров.\n"
+" -o=? задать значение произвольному параметру наÑтройки,\n"
+" например, -o dir::cache=/tmp\n"
+"Ð’ Ñправочных Ñтраницах apt-get(8), sources.list(5) и apt.conf(5)\n"
+"ÑодержитÑÑ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ опиÑание параметров.\n"
" Ð’ APT еÑÑ‚ÑŒ ÐºÐ¾Ñ€Ð¾Ð²ÑŒÑ Ð¡Ð£ÐŸÐ•Ð Ð¡Ð˜Ð›Ð.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"ЗÐМЕЧÐÐИЕ: Производить только Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹!\n"
+" Ð”Ð»Ñ Ñ€ÐµÐ°Ð»ÑŒÐ½Ð¾Ð¹ работы apt-get требуютÑÑ Ð¿Ñ€Ð°Ð²Ð° ÑуперпользователÑ.\n"
+" Учтите, что блокировка не иÑпользуетÑÑ,\n"
+" поÑтому нет полного ÑоответÑÑ‚Ð²Ð¸Ñ Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ реальной Ñитуацией!"
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1461,34 +1461,33 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Удалить вÑе ранее Ñкачанные .deb файлы?"
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ñпаковки возникли ошибки. Будет продолжен процеÑÑ Ð½Ð°Ñтройки"
+msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ñпаковки возникли ошибки. Пакеты, которые были уÑтановлены,"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "уÑтановленных пакетов. Это может привеÑти к повторению ошибок или"
+msgstr "будут наÑтроены. Это может привеÑти к повторению ошибок"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr ""
-"возникновению новых из-за неудовлетворённых завиÑимоÑтей. Это нормально,"
+"или возникновению новых из-за неудовлетворённых завиÑимоÑтей. Это нормально, "
+"важны"
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"важны только ошибки, указанные выше. ИÑправьте их и выполните уÑтановку ещё "
-"раз"
+"только ошибки, указанные в Ñтом Ñообщении. ИÑправьте их и выполните "
+"уÑтановку ещё раз"
#: dselect/update:30
msgid "Merging available information"
-msgstr "Объединение информации о доÑтупных пакетах"
+msgstr "СлиÑние доÑтупной информации"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
-msgstr "Ðе удалоÑÑŒ Ñоздать порождённые процеÑÑÑ‹"
+msgstr "Ðе удалоÑÑŒ Ñоздать каналы"
#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
@@ -1516,9 +1515,9 @@ msgid "Error reading archive member header"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ñлемента архива"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Ðеправильный заголовок Ñлемента архива"
+msgstr "Ðеправильный заголовок Ñлемента архива %s"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1625,7 +1624,7 @@ msgstr "Файл %s/%s перепиÑывает файл в пакете %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1793,11 +1792,11 @@ msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Ðе удалоÑÑŒ получить атрибуты"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Ðе удалоÑÑŒ уÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
@@ -1806,34 +1805,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ðеправильный URI, локальный URI не должен начинатьÑÑ Ñ //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Вход в ÑиÑтему"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Ðевозможно определить Ð¸Ð¼Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ Ñервера"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Ðевозможно определить локальное имÑ"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Сервер разорвал Ñоединение и Ñообщил: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Команда USER не выполнена, Ñервер Ñообщил: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Команда PASS не выполнена, Ñервер Ñообщил: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1841,118 +1840,118 @@ msgstr ""
"Proxy-Ñервер указан, однако нет ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° в ÑиÑтему, Acquire::ftp::"
"ProxyLogin пуÑÑ‚."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"Команда '%s' ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ Ð²Ñ…Ð¾Ð´Ð° в ÑиÑтему завершилаÑÑŒ неудачно, Ñервер Ñообщил: %"
"s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Команда TYPE не выполнена, Ñервер Ñообщил: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "ДопуÑтимое Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Сервер прервал Ñоединение"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Ошибка чтениÑ"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Ответ переполнил буфер."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "ИÑкажение протокола"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Ошибка запиÑи"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Ðе удалоÑÑŒ Ñоздать Ñокет"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
"Ðе удалоÑÑŒ приÑоединитьÑÑ Ðº Ñокету данных, Ð²Ñ€ÐµÐ¼Ñ Ð½Ð° уÑтановление ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ "
"иÑтекло"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Ðевозможно приÑоединить паÑÑивный Ñокет"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Вызов getaddrinfo не Ñмог получить Ñокет"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Ðевозможно приÑоединитьÑÑ Ðº Ñокету"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Ðе удалоÑÑŒ принимать ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð° Ñокете"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Ðе удалоÑÑŒ определить Ð¸Ð¼Ñ Ñокета"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Ðевозможно поÑлать команду PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "ÐеизвеÑтное ÑемейÑтво адреÑов %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Команда EPRT не выполнена, Ñервер Ñообщил: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Ð’Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñокета данных иÑтекло"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Ðевозможно принÑÑ‚ÑŒ Ñоединение"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Ðевозможно получить файл, Ñервер Ñообщил: '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñокета данных иÑтекло"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Передача данных завершилаÑÑŒ неудачно, Ñервер Ñообщил: '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "ЗапроÑ"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Ðевозможно вызвать "
@@ -2004,15 +2003,14 @@ msgid "Temporary failure resolving '%s'"
msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при попытке получить IP Ð°Ð´Ñ€ÐµÑ '%s'"
#: methods/connect.cc:193
-#, fuzzy, c-format
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
-"Что-то Ñтранное произошло при попытке получить IP Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ '%s:%s' (%i)"
+msgstr "Что-то Ñтранное произошло при определении '%s:%s' (%i - %s)"
#: methods/connect.cc:240
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Ðевозможно ÑоединитьÑÑ Ñ %s %s:"
+msgstr "Ðевозможно ÑоединитьÑÑ Ñ %s: %s:"
#: methods/gpgv.cc:71
#, c-format
@@ -2067,80 +2065,80 @@ msgstr "Ðе удалоÑÑŒ открыть канал Ð´Ð»Ñ %s"
msgid "Read error from %s process"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· процеÑÑа %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u Ñимволов"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ðеверный заголовок"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-Ñервер поÑлал неверный заголовок"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http Ñервер поÑлал неверный заголовок Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-Ñервер поÑлал неверный заголовок Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Этот HTTP-Ñервер не поддерживает Ñкачивание фрагментов файлов"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "ÐеизвеÑтный формат данных"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Ошибка запиÑи в выходной файл"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Ошибка запиÑи в файл"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Ошибка запиÑи в файл"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтениÑ, удалённый Ñервер прервал Ñоединение"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ Ñервера"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Ðе удалоÑÑŒ обрезать файл"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Ðеверный заголовок данных"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
@@ -2148,12 +2146,12 @@ msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
msgid "Can't mmap an empty file"
msgstr "Ðевозможно отобразить в памÑÑ‚ÑŒ пуÑтой файл"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ðевозможно отобразить в памÑÑ‚ÑŒ %lu байт"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2162,13 +2160,6 @@ msgstr ""
"Ðе хватает меÑта Ð´Ð»Ñ Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
"Текущее значение: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2357,10 +2348,9 @@ msgstr ""
"Ðарушение защиты памÑти (segmentation fault) в порождённом процеÑÑе %s."
#: apt-pkg/contrib/fileutl.cc:458
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr ""
-"Ðарушение защиты памÑти (segmentation fault) в порождённом процеÑÑе %s."
+msgstr "Порождённый процеÑÑ %s получил Ñигнал %u."
#: apt-pkg/contrib/fileutl.cc:462
#, c-format
@@ -2455,7 +2445,7 @@ msgstr "Ломает"
#: apt-pkg/pkgcache.cc:227
msgid "Enhances"
-msgstr ""
+msgstr "Улучшает"
#: apt-pkg/pkgcache.cc:238
msgid "important"
@@ -2564,14 +2554,16 @@ msgstr "ÐеизвеÑтный тип '%s' в Ñтроке %u в ÑпиÑке и
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %u в ÑпиÑке иÑточников %s (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Ðе удалоÑÑŒ выполнить оперативную наÑтройку '%s'.Подробней, Ñмотрите в man 5 "
+"apt.conf о APT::Immediate-Configure. (%d)"
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2584,12 +2576,14 @@ msgstr ""
"ЕÑли вы дейÑтвительно хотите продолжить, уÑтановите параметр APT::Force-"
"LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"Ðе удалоÑÑŒ выполнить оперативную наÑтройку уже раÑпакованного '%s'. "
+"Подробней, Ñмотрите в man 5 apt.conf о APT::Immediate-Configure."
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2660,12 +2654,12 @@ msgstr "Метод %s запуÑтилÑÑ Ð½Ðµ корректно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Ð’Ñтавьте диÑк Ñ Ð¼ÐµÑ‚ÐºÐ¾Ð¹ '%s' в уÑтройÑтво '%s' и нажмите ввод."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Менеджер пакетов '%s' не поддерживаетÑÑ"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Ðевозможно определить подходÑщий тип менеджера пакетов"
@@ -2687,9 +2681,9 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "Ð’Ñ‹ можете запуÑтить 'apt-get update' Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтих ошибок"
#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ в файле preferences: отÑутÑтвует заголовок Package"
+msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ в файле параметров %s: отÑутÑтвует заголовок Package"
#: apt-pkg/policy.cc:369
#, c-format
@@ -2799,19 +2793,19 @@ msgstr "Ошибка ввода/вывода при попытке ÑохранÐ
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалоÑÑŒ, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum не Ñовпадает"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Хеш Ñумма не Ñовпадает"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "ÐедоÑтупен открытый ключ Ð´Ð»Ñ Ñледующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2820,7 +2814,7 @@ msgstr ""
"Ðе удалоÑÑŒ обнаружить файл пакета %s. Это может означать, что вам придётÑÑ "
"вручную иÑправить Ñтот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2829,30 +2823,30 @@ msgstr ""
"Ðе удалоÑÑŒ обнаружить файл пакета %s. Это может означать, что вам придётÑÑ "
"вручную иÑправить Ñтот пакет."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Ðекорректный перечень пакетов. Ðет Ð¿Ð¾Ð»Ñ Filename: Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Ðе Ñовпадает размер"
#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Ðевозможно разобрать Ñодержимое пакета %s (1)"
+msgstr "Ðевозможно разобрать Ñодержимое файла Release (%s)"
#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Заметьте, вмеÑто %2$s выбираетÑÑ %1$s\n"
+msgstr "ОтÑутÑтвуют разделы в файле Release (%s)"
#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "ОтÑутÑтвуют Ñлементы Hash в файле Release (%s)"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2917,6 +2911,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Ðе удалоÑÑŒ найти ни одного файла пакетов; возможно Ñто не диÑк Debian или Ñ "
+"не той архитектурой?"
#: apt-pkg/cdrom.cc:710
#, c-format
@@ -2970,80 +2966,100 @@ msgstr ""
"Сохранено %i запиÑей Ñ %i отÑутÑтвующими файлами и Ñ %i неÑовпадающими "
"файлами\n"
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "ПропуÑкаетÑÑ Ð½ÐµÑущеÑтвующий файл %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Ðе удалоÑÑŒ найти аутентификационную запиÑÑŒ длÑ: %s"
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Ðе Ñовпадает хеш Ñумма длÑ: %s"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "УÑтанавливаетÑÑ %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "ÐаÑтройка %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr "ВыполнÑетÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ðµ удаление %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr "ВыполнÑетÑÑ Ð¿Ð¾ÑлеуÑтановочный триггер %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
-msgstr "Каталог %s отÑутÑтвует"
+msgstr "ОтÑутÑтвует каталог %s"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "ПодготавливаетÑÑ %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "РаÑпаковываетÑÑ %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "ПодготавливаетÑÑ Ð´Ð»Ñ Ð½Ð°Ñтройки %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "УÑтановлен %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "ПодготавливаетÑÑ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Удалён %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка к полному удалению %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "%s полноÑтью удалён"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ðе удалоÑÑŒ запиÑать в журнал, неудачное выполнение openpty() (/dev/pts не "
"Ñмонтирован?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
-msgstr ""
+msgstr "ЗапуÑкаетÑÑ dpkg"
#: apt-pkg/deb/debsystem.cc:70
#, c-format
@@ -3051,48 +3067,51 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Ðе удалоÑÑŒ выполнить блокировку управлÑющего каталога (%s); он уже "
+"иÑпользуетÑÑ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ процеÑÑом?"
#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ðевозможно заблокировать каталог Ñо ÑпиÑками пакетов"
+msgstr ""
+"Ðе удалоÑÑŒ выполнить блокировку управлÑющего каталога (%s); у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ права "
+"ÑуперпользователÑ?"
#: apt-pkg/deb/debsystem.cc:82
msgid ""
"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
"the problem. "
msgstr ""
+"Работа dpkg прервана, вы должны вручную запуÑтить 'dpkg --configure -a' Ð´Ð»Ñ "
+"уÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹. "
#: apt-pkg/deb/debsystem.cc:100
msgid "Not locked"
msgstr "Ðе заблокирован"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+#| msgid "Could not open file %s"
+msgid "Could not patch file"
+msgstr "Ðе удалоÑÑŒ открыть файл %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "Ðет пакета Ñ Ð¸Ñходным кодом '%s', вмеÑто него берётÑÑ '%s'\n"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Ðе удалоÑÑŒ пропатчить файл"
-
-#~ msgid "%4i %s\n"
-#~ msgstr "%4i %s\n"
-
-#~ msgid "Processing triggers for %s"
-#~ msgstr "ОбрабатываютÑÑ Ñ‚Ñ€Ð¸Ð³Ð³ÐµÑ€Ñ‹ Ð´Ð»Ñ %s"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Ðе удалоÑÑŒ наложить заплату %s Ñ Ð¸Ñпользованием mmap и файловой операции "
+#~ "-- вероÑтно, повреждена заплата."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Ðе удалоÑÑŒ наложить заплату %s Ñ Ð¸Ñпользованием mmap (но не из-за mmap) "
+#~ "-- вероÑтно, повреждена заплата."
diff --git a/po/sk.po b/po/sk.po
index 088293d63..1d0aa1165 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,14 +4,14 @@
# thanks to Miroslav Kure <kurem@debian.cz>
#
# Peter Mann <Peter.Mann@tuke.sk>, 2006.
-# Ivan Masár <helix84@centrum.sk>, 2008, 2009.
+# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-07-21 12:45+0100\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"PO-Revision-Date: 2010-02-03 18:17+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
@@ -148,14 +148,9 @@ msgstr " Pripevnený balík:"
msgid " Version table:"
msgstr " Tabuľka verzií:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pre %s skompilovaný %s %s\n"
@@ -235,9 +230,8 @@ msgstr ""
"Viac informácií nájdete v manuálových stránkach apt-cache(8) a apt.conf(5).\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Zadajte názov tohto disku, napríklad „Debian 2.1r1 Disk 1“"
+msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
@@ -308,7 +302,7 @@ msgstr ""
" -c=? NaÄíta tento konfiguraÄný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
@@ -441,8 +435,12 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
#: ftparchive/cachedb.cc:72
+#, fuzzy
+#| msgid ""
+#| "DB format is invalid. If you upgraded from a older version of apt, please "
+#| "remove and re-create the database."
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
@@ -459,11 +457,11 @@ msgstr "Nedá sa otvoriť DB súbor %s: %s"
msgid "Failed to stat %s"
msgstr "%s sa nedá vyhodnotiť"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archív nemá riadiaci záznam"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
@@ -528,26 +526,26 @@ msgstr "*** Nepodarilo sa zlinkovať %s s %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -651,7 +649,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -812,11 +810,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukonÄilo"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nedá sa naÄítaÅ¥ zoznam zdrojov."
@@ -847,8 +845,8 @@ msgstr "Po tejto operácii sa na disku použije Äalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -885,7 +883,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokraÄovaÅ¥ [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -894,7 +892,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr "SÅ¥ahovanie ukonÄené v režime „iba stiahnuť“"
@@ -990,52 +988,52 @@ msgstr "Nebola nájdená verzia „%s“ pre „%s“"
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“"
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1352
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
+msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
-#: cmdline/apt-get.cc:1383
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
+
+#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
-#: cmdline/apt-get.cc:1503
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1525
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
-"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
+"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Na ich odstránenie použite „apt-get autoremove“."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1053,43 +1051,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnútorná chyba, AutoRemover nieÄo pokazil"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr "Nebolo možné nájsť úlohu %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je nastavený na manuálnu inštaláciu.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1097,7 +1095,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1809
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1109,124 +1107,124 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr "OdporúÄané balíky:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr "PrepoÄítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, „problem resolver“ nieÄo pokazil"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, Äi je nainÅ¡talovaný balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti na zostavenie %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2564
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,31 +1233,31 @@ msgstr ""
"%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1343,7 +1341,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tento APT má schopnosti posvätnej kravy.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1434,14 +1432,13 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Chcete odstrániť všetky doteraz stiahnuté .deb súbory?"
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Pri rozbaľovaní došlo k nejakým chybám. Teraz sa nastavia"
+msgstr ""
+"Pri rozbaľovaní došlo k nejakým chybám. Balíky, ktoré boli nainštalované"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "balíky, ktoré sa nainštalovali. Môže to spôsobiť chybové správy"
+msgstr "budú nakonfigurované. Môže to spôsobiť opakované chybové správy"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1487,9 +1484,9 @@ msgid "Error reading archive member header"
msgstr "Chyba pri Äítaní záhlavia prvku archívu"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Neplatné záhlavie prvku archívu"
+msgstr "Neplatná hlaviÄka prvku archívu %s"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1593,11 +1590,10 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr "Nedá sa naÄítaÅ¥ %s"
@@ -1627,9 +1623,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr "NaÄítavajú sa zoznamy balíkov"
@@ -1776,34 +1772,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Neplatné URI, lokálne URI nesmie zaÄínaÅ¥ s //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Prihlasovanie"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nedá sa zistiť názov druhej strany"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nedá sa zistiť lokálny názov"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Server zamietol naše spojenie s chybou: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1811,114 +1807,114 @@ msgstr ""
"Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::"
"ProxyLogin je prázdny."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Uplynul Äas spojenia"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Server ukonÄil spojenie"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr "Chyba pri Äítaní"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "OdpoveÄ preplnila zásobník."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Narušenie protokolu"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr "Chyba pri zápise"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nedá sa vytvoriť socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Nedá sa pripojiÅ¥ dátový socket, uplynul Äas spojenia"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nedá sa pripojiť pasívny socket."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo nezískal poÄúvajúci socket"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nedá sa nadviazať socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Na sockete sa nedá poÄúvaÅ¥"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Názov socketu sa nedá zistiť"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Príkaz PORT sa nedá odoslať"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Neznáma rodina adries %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Uplynulo spojenie dátového socketu"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hašovaním súboru"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Uplynula doba dátového socketu"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Prenos dát zlyhal, server odpovedal „%s“"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
@@ -1959,60 +1955,66 @@ msgstr "Nedá sa pripojiť k %s:%s (%s)."
msgid "Connecting to %s"
msgstr "Pripája sa k %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie je možné preložiť „%s“"
-#: methods/connect.cc:190
+#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "DoÄasné zlyhanie pri preklade „%s“"
-#: methods/connect.cc:193
-#, fuzzy, c-format
+#: methods/connect.cc:194
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "NieÄo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)"
+msgstr "NieÄo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
-#: methods/connect.cc:240
-#, fuzzy, c-format
+#: methods/connect.cc:241
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Nedá sa pripojiť k %s %s:"
+msgstr "Nedá sa pripojiť k %s:%s:"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Zväzok kľúÄov „%s“ je nedostupný."
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+#| msgid "Aborting install."
+msgid "No keyring installed in %s."
+msgstr "Inštalácia sa prerušuje."
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliÅ¡ dlhý. UkonÄuje "
"sa."
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:237
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:228
+#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Nedá sa spustiť „%s“ na kontrolu signatúry (je nainštalované gpgv?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr "Neznáma chyba pri spustení gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2030,80 +2032,80 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri Äítaní z procesu %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "ÄŒaká sa na hlaviÄky"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlaviÄky cez %u znakov"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Chybná hlaviÄka"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlaviÄku odpovede"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlaviÄku Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlaviÄku Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:788
+#: methods/http.cc:791
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:793
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr "Uplynul Äas spojenia"
-#: methods/http.cc:816
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:847
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:875
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr "Chyba zápisu do tohto súboru"
-#: methods/http.cc:889
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri Äítaní zo servera. Druhá strana ukonÄila spojenie"
-#: methods/http.cc:891
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr "Chyba pri Äítaní zo servera"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Nepodarilo sa skrátiť súbor"
-#: methods/http.cc:1147
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1311
+#: methods/http.cc:1314
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2161,53 +2163,53 @@ msgstr "%li s"
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nerozpoznaná skratka typu: „%c“"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "Otvára sa konfiguraÄný súbor %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaktická chyba %s:%u: Blok zaÄína bez názvu."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaktická chyba %s:%u: Skomolená znaÄka"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
@@ -2283,75 +2285,75 @@ msgstr "Nedá sa prejsť do %s"
msgid "Failed to stat the cdrom"
msgstr "Nedá sa vykonať stat() CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na Äítanie, sa nepoužíva"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr "Súbor zámku %s sa nedá otvoriť"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr "Zámok %s sa nedá získať"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "ÄŒakalo sa na %s, ale nebolo to tam"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s obdržal chybu segmentácie."
-#: apt-pkg/contrib/fileutl.cc:458
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:582
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s obdržal chybu segmentácie."
+msgstr "Podproces %s dostal signál %u."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586
#, 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:464
+#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neoÄakávane skonÄil"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr "Nedá sa otvoriť súbor %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "Äítanie, stále treba preÄítaÅ¥ %lu, ale už niÄ neostáva"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr "Problém pri zatváraní súboru"
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr "Problém pri odstraňovaní súboru"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
@@ -2468,64 +2470,66 @@ msgstr "Súbor %s sa nedá spracovať (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Súbor %s sa nedá spracovať (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
+"man 5 apt.conf pod APT::Immediate-Configure (%d)"
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2536,12 +2540,14 @@ msgstr ""
"kvôli sluÄke v Conflicts/Pre-Depends. ÄŒasto je to nevhodné, ale ak to chcete "
"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"Nebolo možné vykonať okamžitú konfiguráciu už rozbaleného „%s“. Pozri prosím "
+"podrobnosti v man 5 apt.conf pod APT::Immediate-Configure"
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2611,12 +2617,12 @@ msgstr "Spôsob %s nebol správne spustený"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlaÄte Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Systém balíkov „%s“ nie je podporovaný"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa urÄiÅ¥ vhodný typ systému balíkov"
@@ -2637,17 +2643,17 @@ msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvor
msgid "You may want to run apt-get update to correct these problems"
msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
-#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#: apt-pkg/policy.cc:316
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neplatný záznam v súbore „preferences“, žiadne záhlavie balíka"
+msgstr "Neplatný záznam v súbore nastavení %s, chýba hlaviÄka Package"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nezrozumiteľné pridržanie typu %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
@@ -2733,16 +2739,16 @@ msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
@@ -2751,19 +2757,19 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr "Nezhoda kontrolných MD5 súÄtov"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haÅ¡ súÄtov"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúÄe ku kľúÄom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1260
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2772,7 +2778,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:1283
+#: apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2781,30 +2787,30 @@ 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:1324
+#: apt-pkg/acquire-item.cc:1360
#, 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:1411
+#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Súbor %s sa nedá spracovať (1)"
+msgstr "Nedá spracovať súbor Release %s"
#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Poznámka: %s sa vyberá namiesto %s\n"
+msgstr "Žiadne sekcie v Release súbore %s"
#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Chýba položka Hash v súbore Release %s"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2869,6 +2875,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
+"alebo je pre nesprávnu architektúru?"
#: apt-pkg/cdrom.cc:710
#, c-format
@@ -2920,98 +2928,120 @@ msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Preskakuje sa neexistujúci súbor %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Nebolo možné nájsÅ¥ autentifikaÄný záznam pre: %s"
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Nezhoda kontrolných haÅ¡ súÄtov: %s"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Inštaluje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Nastavuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Odstraňuje sa %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr "Úplne sa odstraňuje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr "Vykonáva sa spúšťaÄ post-installation %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresár „%s“ chýba"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Pripravuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaľuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravuje sa nastavenie %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Nainštalovaný balík %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravuje sa odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Odstránený balík %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravuje sa úplné odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
"pripojený?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
-msgstr ""
+msgstr "Spúšťa sa dpkg"
#: apt-pkg/deb/debsystem.cc:70
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
-msgstr ""
+msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Adresár zoznamov sa nedá zamknúť"
+msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
#: apt-pkg/deb/debsystem.cc:82
msgid ""
"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
"the problem. "
msgstr ""
+"dpkg bol preruÅ¡ený, musíte ruÄne opraviÅ¥ problém spustením „dpkg --configure "
+"-a“. "
#: apt-pkg/deb/debsystem.cc:100
msgid "Not locked"
@@ -3035,12 +3065,18 @@ msgstr ""
msgid "Connection closed prematurely"
msgstr "Spojenie bolo predÄasne ukonÄené"
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Zväzok kľúÄov „%s“ je nedostupný."
#~ msgid "Could not patch file"
#~ msgstr "Nedá sa upraviť súbor"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/sl.po b/po/sl.po
index 5cdc022da..9b1505348 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -143,14 +143,9 @@ msgstr " Zaponka paketa:"
msgid " Version table:"
msgstr " Tabela razlièic:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
@@ -649,7 +644,7 @@ msgstr "Ni mogoèe preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -812,11 +807,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno."
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Ni mogoèe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoèe brati."
@@ -845,8 +840,8 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
@@ -883,7 +878,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali ¾elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoèe dobiti %s %s\n"
@@ -892,7 +887,7 @@ msgstr "Ni mogoèe dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Prenos dokonèan in uporabljen naèin samo prenos"
@@ -990,50 +985,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razlièica %s (%s) za %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoèe zakleniti"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Naslednji NOVI paketi bodo name¹èeni:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Naslednji NOVI paketi bodo name¹èeni:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1049,44 +1044,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ni mogoèe najti paketa %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoèe najti paketa %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "vendar bo paket %s name¹èen"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1089,7 @@ msgstr ""
"Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte re¹itev)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,126 +1100,126 @@ msgstr ""
"nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo name¹èeni:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Priporoèeni paketi:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Preraèunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoèe najti"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoèe dobiti."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Otro¹ki proces ni uspel"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,31 +1228,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne "
"more zadostiti zahtevi po razlièici"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1340,7 +1335,7 @@ msgstr ""
"sources.list(5) in apt.conf(5).\n"
" APT ima moè Super Krave.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1591,7 +1586,7 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1758,11 +1753,11 @@ msgid "File not found"
msgstr "Datoteke ni mogoèe najti"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Doloèitev ni uspela"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Nastavitev èasa spremembe ni uspela"
@@ -1771,34 +1766,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Napaèen URI. Lokalni URI-ji se morajo zaèeti z /"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Prijavljam se"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Ni mogoèe ugotoviti imena gostitelja"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Ni mogoèe ugotoviti lokalnega imena"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Stre¾nik je zavrnil na¹o povezavo in sporoèil: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER ni uspel, stre¾nik je odgovoril: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS ni uspel, stre¾nik je odgovoril: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1806,114 +1801,114 @@ msgstr ""
"Naveden je bil proxy-stre¾nik, ne pa tudi prijavna skripta. Acquire::ftp::"
"ProxyLogin je prazen."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Ukaz prijavne skripte '%s' ni uspel, stre¾nik je odgovoril: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE ni uspel, stre¾nik je odgovoril: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Povezava potekla"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Stre¾nik je zaprl povezavo"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Napaka pri branju"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Odgovor je prekoraèil vmesnik."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Okvara protokola"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Napaka pri pisanju"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Ni mogoèe ustvariti vtiènice"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Ni mogoèe priklopiti podatkovne vtiènice. Povezava potekla."
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Ni mogoèe priklopiti pasivne vtiènice."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo ni mogel dobiti poslu¹ajoèe vtiènice"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Ni mogoèe povezati vtiènice"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Ni mogoèe poslu¹ati na vtiènici"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Ni mogoèe ugotoviti imena vtiènice"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Ni mogoèe poslati ukaza PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Neznan naslov dru¾ine %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT ni uspel, stre¾nik je odgovoril: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Povezava podatkovne vtiènice potekla"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Ni mogoèe sprejeti povezave"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Te¾ava pri razpr¹evanju datoteke"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Ni mogoèe dobiti datoteke, stre¾nik je odgovoril '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Podatkovna vtiènica je potekla"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Prenos podatkov ni uspel, stre¾nik je odgovoril '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Poizvedba"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Ni mogoèe zagnati "
@@ -2022,81 +2017,81 @@ msgstr "Ni mogoèe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Èakanje na glave"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Napaèna vrstica glave"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Èas za povezavo se je iztekel"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika "
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Napaka pri branju s stre¾nika"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Napaka pri pisanju datoteke %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Napaèni podatki glave"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2104,25 +2099,18 @@ msgstr "Notranja napaka"
msgid "Can't mmap an empty file"
msgstr "mmap prazne datoteke ni mogoè"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoèe narediti mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2510,14 +2498,14 @@ msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2528,7 +2516,7 @@ msgstr ""
"zanke spora/predodvisnosti. To je ponavadi slabo, toda èe zares ¾elite "
"odstranitev, vkljuèite mo¾nost APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2607,12 +2595,12 @@ msgstr ""
" '%s'\n"
"v enoto '%s' in pritisnite enter\n"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema"
@@ -2746,20 +2734,20 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2768,7 +2756,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2777,7 +2765,7 @@ msgstr ""
"Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2785,7 +2773,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
@@ -2919,76 +2907,97 @@ msgstr ""
"Zapisal %i zapisov z %i manjkajoèimi datotekami in %i neujemajoèimi "
"datotekami.\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Odpiranje nastavitvene datoteke %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Neujemanje vsote MD5"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Name¹èen: "
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se z %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Odpiram %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Odstranitev %s ni uspela"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Manjka imenik s seznami %spartial."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Name¹èen: "
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Priporoèa"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Odstranitev %s ni uspela"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3014,27 +3023,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "Ne morem odpreti datoteke %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Povezava se je prezgodaj zaprla"
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "Ne morem odpreti datoteke %s"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/sv.po b/po/sv.po
index ec7f2d32e..bc3dc6e37 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-03-03 23:15+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -145,14 +145,9 @@ msgstr " Paketnålning: "
msgid " Version table:"
msgstr " Versionstabell:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s för %s kompilerad den %s %s\n"
@@ -654,7 +649,7 @@ msgstr "Misslyckades med att byta namn på %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -816,11 +811,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen färdigställdes inte"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Listan över källor kunde inte läsas."
@@ -852,8 +847,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
@@ -891,7 +886,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortsätta [J/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
@@ -900,7 +895,7 @@ msgstr "Misslyckades med att hämta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades med att hämta vissa filer"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
@@ -999,52 +994,52 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) för %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kunde inte ta status på källkodspaketlistan %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Kunde inte låsa listkatalogen"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1062,44 +1057,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Följande information kan vara till hjälp för att lösa situationen:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internt fel, AutoRemover förstörde något"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade förstörde något"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunde inte hitta funktionen %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1107,7 +1102,7 @@ msgstr ""
"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
"(eller ange en lösning)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1119,115 +1114,115 @@ msgstr ""
"att några nödvändiga paket ännu inte har skapats eller flyttats\n"
"ut från \"Incoming\"."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Följande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Föreslagna paket:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Färdig"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlösaren förstörde någonting"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta något källkodspaket för %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta information om byggberoenden för %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1236,7 +1231,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1245,32 +1240,32 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
"versioner av paketet %s tillfredsställer versionskraven"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
"paketet %s är för nytt"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1354,7 +1349,7 @@ msgstr ""
"för mer information och flaggor.\n"
" Denna APT har Speciella Ko-Krafter.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1610,7 +1605,7 @@ msgstr "Filen %s/%s skriver över den i paketet %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1778,11 +1773,11 @@ msgid "File not found"
msgstr "Filen hittades inte"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Misslyckades ställa in ändringstid"
@@ -1791,34 +1786,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ogiltig URI, lokala URI:er får inte börja med //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Loggar in"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Kunde inte fastställa namnet på partnern"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Kunde inte fastställa det lokala namnet"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Servern nekade anslutningen och sade: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER misslyckades, servern sade: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS misslyckades, servern sade: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1826,115 +1821,115 @@ msgstr ""
"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
"ProxyLogin är tom."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE misslyckades, servern sade: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Tidsgränsen för anslutningen överskreds"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Servern stängde anslutningen"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Läsfel"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Ett svar spillde bufferten."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protokollet skadat"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivfel"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Kunde inte skapa ett uttag (socket)"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Kunde inte ansluta passivt uttag (socket)."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Kunde inte binda ett uttag (socket)"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Kunde inte lyssna på uttaget (socket)"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Kunde inte fastställa uttagets namn (socket)"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Kunde inte sända PORT-kommando"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Okänd adressfamilj %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT misslyckades, servern sade: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutningen"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Kunde inte hämta filen, servern sade \"%s\""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Datauttag (socket) fick inte svar inom tidsgränsen"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Dataöverföringen misslyckades, servern sade \"%s\""
# Statusmeddelande, byter från substantiv till verb
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Frågar"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Kunde inte starta "
@@ -2051,80 +2046,80 @@ msgstr "Kunde inte öppna rör för %s"
msgid "Read error from %s process"
msgstr "Läsfel från %s-processen"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Väntar på rubriker"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam rubrikrad på %u tecken"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Felaktig rubrikrad"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern sände ett ogiltigt svarshuvud"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Anslutningen överskred tidsgränsen"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Misslyckades med att kapa av filen"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Felaktiga data i huvud"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Anslutningen misslyckades"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Internt fel"
@@ -2132,12 +2127,12 @@ msgstr "Internt fel"
msgid "Can't mmap an empty file"
msgstr "Kan inte utföra mmap på en tom fil"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utföra mmap på %lu byte"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2146,13 +2141,6 @@ msgstr ""
"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
"Aktuellt värde: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2543,14 +2531,14 @@ msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rad %u i källistan %s har fel format (leverantörs-id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2562,7 +2550,7 @@ msgstr ""
"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du "
"aktivera flaggan \"APT::Force-LoopBreak\"."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2639,13 +2627,13 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck på Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" stöds inte"
#
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
@@ -2782,19 +2770,19 @@ msgstr "In-/utfel vid lagring av källcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2803,7 +2791,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2812,13 +2800,13 @@ 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:1324
+#: apt-pkg/acquire-item.cc:1316
#, 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:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
@@ -2951,77 +2939,100 @@ msgstr "Skrev %i poster med %i filer som inte stämmer\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Öppnar konfigurationsfilen %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash-kontrollsumman stämmer inte"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installerar %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Konfigurerar %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Tog bort hela %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kör efterinstallationsutlösare %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Katalogen \"%s\" saknas"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Förbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Packar upp %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Förbereder konfigurering av %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Installerade %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Förbereder borttagning av %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Tog bort %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Förbereder borttagning av hela %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3047,26 +3058,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Kunde inte lägga på programfix på filen"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Anslutningen stängdes i förtid"
-#~ msgid "Could not patch file"
-#~ msgstr "Kunde inte lägga på programfix på filen"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
# Prioritet följt av URI
#~ msgid "%4i %s\n"
diff --git a/po/th.po b/po/th.po
index 877d56ff7..8a98257fa 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-11-06 15:54+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -145,14 +145,9 @@ msgstr " à¸à¸²à¸£à¸•à¸£à¸¶à¸‡à¹à¸žà¸à¹€à¸à¸ˆ: "
msgid " Version table:"
msgstr " ตารางรุ่น:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
@@ -644,7 +639,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปà¹
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรà¸à¸´à¸§à¸¥à¸²à¸£à¹Œà¹„ม่สำเร็จ - %s"
@@ -805,11 +800,11 @@ msgstr "มีà¹à¸žà¸à¹€à¸à¸ˆà¸—ี่จำเป็นต้องถอด
msgid "Internal error, Ordering didn't finish"
msgstr "ข้อผิดพลาดภายใน: à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸‡à¸¥à¸³à¸”ับไม่เสร็จสิ้น"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรà¸à¸—อรีดาวน์โหลด"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ไม่สามารถอ่านรายชื่อà¹à¸«à¸¥à¹ˆà¸‡à¹à¸žà¸à¹€à¸à¸ˆà¹„ด้"
@@ -838,8 +833,8 @@ msgstr "หลังจาà¸à¸à¸²à¸£à¸à¸£à¸°à¸—ำนี้ ต้องใà¸
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "หลังจาà¸à¸à¸²à¸£à¸à¸£à¸°à¸—ำนี้ เนื้อที่บนดิสà¸à¹Œà¸ˆà¸°à¸§à¹ˆà¸²à¸‡à¹€à¸žà¸´à¹ˆà¸¡à¸­à¸µà¸ %sB\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
@@ -876,7 +871,7 @@ msgstr "เลิà¸à¸—ำ"
msgid "Do you want to continue [Y/n]? "
msgstr "คุณต้องà¸à¸²à¸£à¸ˆà¸°à¸”ำเนินà¸à¸²à¸£à¸•à¹ˆà¸­à¹„ปหรือไม่ [Y/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
@@ -885,7 +880,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
msgid "Some files failed to download"
msgstr "ดาวน์โหลดบางà¹à¸Ÿà¹‰à¸¡à¹„ม่สำเร็จ"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จà¹à¸¥à¹‰à¸§ à¹à¸¥à¸°à¸­à¸¢à¸¹à¹ˆà¹ƒà¸™à¹‚หมดดาวน์โหลดอย่างเดียว"
@@ -982,49 +977,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "เลือà¸à¸£à¸¸à¹ˆà¸™ %s (%s) สำหรับ %s à¹à¸¥à¹‰à¸§\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "ไม่สามารถ stat รายà¸à¸²à¸£à¹à¸žà¸à¹€à¸à¸ˆà¸‹à¸­à¸£à¹Œà¸ª %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "คำสั่ง update ไม่รับอาร์à¸à¸´à¸§à¹€à¸¡à¸™à¸•à¹Œà¹€à¸žà¸´à¹ˆà¸¡"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "ไม่สามารถล็อคไดเรà¸à¸—อรีรายชื่อà¹à¸žà¸à¹€à¸à¸ˆ"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "apt ถูà¸à¸à¸³à¸«à¸™à¸”ไม่ให้มีà¸à¸²à¸£à¸¥à¸šà¹ƒà¸”ๆ จึงไม่สามารถดำเนินà¸à¸²à¸£à¸–อดถอนอัตโนมัติได้"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "à¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้ถูà¸à¸•à¸´à¸”ตั้งà¹à¸šà¸šà¸­à¸±à¸•à¹‚นมัติไว้ à¹à¸¥à¸°à¹„ม่ต้องใช้อีà¸à¸•à¹ˆà¸­à¹„ปà¹à¸¥à¹‰à¸§:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "à¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้ถูà¸à¸•à¸´à¸”ตั้งà¹à¸šà¸šà¸­à¸±à¸•à¹‚นมัติไว้ à¹à¸¥à¸°à¹„ม่ต้องใช้อีà¸à¸•à¹ˆà¸­à¹„ปà¹à¸¥à¹‰à¸§:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ใช้ 'apt-get autoremove' เพื่อลบà¹à¸žà¸à¹€à¸à¸ˆà¸”ังà¸à¸¥à¹ˆà¸²à¸§à¹„ด้"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1042,43 +1037,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "ข้อมูลต่อไปนี้อาจช่วยà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹„ด้:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "ไม่พบงาน %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "ไม่พบà¹à¸žà¸à¹€à¸à¸ˆ %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "หมายเหตุ: จะเลือภ%s สำหรับนิพจน์เรà¸à¸´à¸§à¸¥à¸²à¸£à¹Œ '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "à¸à¸³à¸«à¸™à¸” %s ให้เป็นà¸à¸²à¸£à¸•à¸´à¸”ตั้งà¹à¸šà¸šà¹€à¸¥à¸·à¸­à¸à¹€à¸­à¸‡à¹à¸¥à¹‰à¸§\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "คุณอาจเรียภ`apt-get -f install' เพื่อà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¸™à¸µà¹‰à¹„ด้:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1086,7 +1081,7 @@ msgstr ""
"มีปัà¸à¸«à¸²à¸„วามขึ้นต่อà¸à¸±à¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¹à¸žà¸à¹€à¸à¸ˆ à¸à¸£à¸¸à¸“าลองใช้ 'apt-get -f install' โดยไม่ระบุà¹à¸žà¸à¹€à¸à¸ˆ "
"(หรือจะระบุทางà¹à¸à¹‰à¸à¹‡à¹„ด้)"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1097,122 +1092,122 @@ msgstr ""
"หรือถ้าคุณà¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸£à¸¸à¹ˆà¸™ unstable à¸à¹‡à¹€à¸›à¹‡à¸™à¹„ปได้ว่าà¹à¸žà¸à¹€à¸à¸ˆà¸—ี่จำเป็นบางรายà¸à¸²à¸£\n"
"ยังไม่ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้น หรือถูà¸à¸¢à¹‰à¸²à¸¢à¸­à¸­à¸à¸ˆà¸²à¸ Incoming"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "à¹à¸žà¸à¹€à¸à¸ˆà¸¡à¸µà¸›à¸±à¸à¸«à¸²"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "จะติดตั้งà¹à¸žà¸à¹€à¸à¸ˆà¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸•à¹ˆà¸­à¹„ปนี้:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "à¹à¸žà¸à¹€à¸à¸ˆà¸—ี่à¹à¸™à¸°à¸™à¸³:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "à¹à¸žà¸à¹€à¸à¸ˆà¸—ี่ควรใช้ร่วมà¸à¸±à¸™:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ำนวณà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸£à¸¸à¹ˆà¸™... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "ล้มเหลว"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "เสร็จà¹à¸¥à¹‰à¸§"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดภายใน: à¸à¸¥à¹„à¸à¸à¸²à¸£à¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¸—ำความเสียหาย"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุà¹à¸žà¸à¹€à¸à¸ˆà¸­à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸­à¸¢à¸«à¸™à¸¶à¹ˆà¸‡à¹à¸žà¸à¹€à¸à¸ˆà¸—ี่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบà¹à¸žà¸à¹€à¸à¸ˆà¸‹à¸­à¸£à¹Œà¸ªà¹‚ค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามà¹à¸Ÿà¹‰à¸¡ '%s' ที่ดาวน์โหลดไว้à¹à¸¥à¹‰à¸§\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางà¹à¸Ÿà¹‰à¸¡"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามà¸à¸²à¸£à¹à¸•à¸à¸‹à¸­à¸£à¹Œà¸ªà¸‚องซอร์สที่à¹à¸•à¸à¹„ว้à¹à¸¥à¹‰à¸§à¹ƒà¸™ %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งà¹à¸•à¸à¹à¸Ÿà¹‰à¸¡ '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "à¸à¸£à¸¸à¸“าตรวจสอบว่าได้ติดตั้งà¹à¸žà¸à¹€à¸à¸ˆ 'dpkg-dev' à¹à¸¥à¹‰à¸§\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "โพรเซสลูà¸à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุà¹à¸žà¸à¹€à¸à¸ˆà¸­à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸­à¸¢à¸«à¸™à¸¶à¹ˆà¸‡à¹à¸žà¸à¹€à¸à¸ˆà¸—ี่จะตรวจสอบสิ่งที่ต้องà¸à¸²à¸£à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£ build"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องà¸à¸²à¸£à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£ build ของ %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องà¸à¸²à¸£à¸ªà¸´à¹ˆà¸‡à¹ƒà¸”สำหรับ build\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบà¹à¸žà¸à¹€à¸à¸ˆ %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,30 +1216,30 @@ msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีà¹à¸žà¸à¹€à¸à¸ˆ %s "
"รุ่นที่จะสอดคล้องà¸à¸±à¸šà¸„วามต้องà¸à¸²à¸£à¸£à¸¸à¹ˆà¸™à¸‚องà¹à¸žà¸à¹€à¸à¸ˆà¹„ด้"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: à¹à¸žà¸à¹€à¸à¸ˆ %s ที่ติดตั้งไว้ใหม่เà¸à¸´à¸™à¹„ป"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับà¸à¸²à¸£ build ของ %s ได้"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับà¸à¸²à¸£ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1328,7 +1323,7 @@ msgstr ""
"à¹à¸¥à¸° apt.conf(5)\n"
" APT นี้มีพลังของ Super Cow\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1576,7 +1571,7 @@ msgstr "à¹à¸Ÿà¹‰à¸¡ %s/%s เขียนทับà¹à¸Ÿà¹‰à¸¡à¹ƒà¸™à¹à¸žà¸à¹
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1741,11 +1736,11 @@ msgid "File not found"
msgstr "ไม่พบà¹à¸Ÿà¹‰à¸¡"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "à¸à¸³à¸«à¸™à¸”เวลาà¹à¸à¹‰à¹„ขไม่สำเร็จ"
@@ -1754,147 +1749,147 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI ไม่ถูà¸à¸•à¹‰à¸­à¸‡ URI ของà¹à¸Ÿà¹‰à¸¡à¹ƒà¸™à¹€à¸„รื่องต้องขึ้นต้นด้วย //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "เข้าระบบ"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "ไม่สามารถอ่านชื่อของอีà¸à¸à¹ˆà¸²à¸¢à¹„ด้"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "เซิร์ฟเวอร์ปà¸à¸´à¹€à¸ªà¸˜à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­à¹‚ดยรายงานว่า: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr "มีà¸à¸²à¸£à¸£à¸°à¸šà¸¸à¸žà¸£à¹‡à¸­à¸à¸‹à¸µ à¹à¸•à¹ˆà¹„ม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "หมดเวลารอเชื่อมต่อ"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "เซิร์ฟเวอร์ปิดà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "à¸à¸²à¸£à¸­à¹ˆà¸²à¸™à¸‚้อมูลผิดพลาด"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "คำตอบท่วมบัฟเฟอร์"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "มีความเสียหายของโพรโทคอล"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "à¸à¸²à¸£à¹€à¸‚ียนข้อมูลผิดพลาด"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "ไม่สามารถสร้างซ็อà¸à¹€à¸à¹‡à¸•"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "ไม่สามารถเชื่อมต่อซ็อà¸à¹€à¸à¹‡à¸•à¸‚้อมูล เนื่องจาà¸à¸«à¸¡à¸”เวลาคอย"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "ไม่สามารถเชื่อมต่อซ็อà¸à¹€à¸à¸•à¹à¸šà¸š passive"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo ไม่สามารถนำซ็อà¸à¹€à¸à¹‡à¸•à¸—ี่รอรับà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­à¸¡à¸²à¹ƒà¸Šà¹‰"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "ไม่สามารถ bind ซ็อà¸à¹€à¸à¹‡à¸•"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "ไม่สามารถ listen ที่ซ็อà¸à¹€à¸à¹‡à¸•"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "ไม่สามารถระบุชื่อซ็อà¸à¹€à¸à¹‡à¸•"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "ไม่สามารถส่งคำสั่ง PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "ไม่รู้จัà¸à¸•à¸£à¸°à¸à¸¹à¸¥à¸—ี่อยู่ %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "หมดเวลารอเชื่อมต่อซ็อà¸à¹€à¸à¹‡à¸•à¸‚้อมูล"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "ไม่สามารถรับà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "เà¸à¸´à¸”ปัà¸à¸«à¸²à¸‚ณะคำนวณค่าà¹à¸®à¸Šà¸‚องà¹à¸Ÿà¹‰à¸¡"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "ไม่สามารถดาวน์โหลดà¹à¸Ÿà¹‰à¸¡ เซิร์ฟเวอร์ตอบว่า: '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "หมดเวลาคอยที่ซ็อà¸à¹€à¸à¹‡à¸•à¸‚้อมูล"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "สอบถาม"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "ไม่สามารถเรียภ"
@@ -2002,80 +1997,80 @@ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s
msgid "Read error from %s process"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดขณะอ่านจาà¸à¹‚พรเซส %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "รอหัวข้อมูล"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเà¸à¸´à¸™ %u อัà¸à¸‚ระ"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "à¸à¸²à¸£à¸ªà¸™à¸±à¸šà¸ªà¸™à¸¸à¸™ Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "พบรูปà¹à¸šà¸šà¸§à¸±à¸™à¸—ี่ที่ไม่รู้จัà¸"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "select ไม่สำเร็จ"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "หมดเวลารอเชื่อมต่อ"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดขณะเขียนลงà¹à¸Ÿà¹‰à¸¡à¸œà¸¥à¸¥à¸±à¸žà¸˜à¹Œ"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดขณะเขียนลงà¹à¸Ÿà¹‰à¸¡"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดขณะเขียนลงà¹à¸Ÿà¹‰à¸¡"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดขณะอ่านข้อมูลจาà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸­à¸£à¹Œ ปลายทางอีà¸à¸”้านหนึ่งปิดà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "เà¸à¸´à¸”ข้อผิดพลาดขณะอ่านข้อมูลจาà¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸­à¸£à¹Œ"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "ไม่สามารถตัดท้ายà¹à¸Ÿà¹‰à¸¡"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "ข้อมูลส่วนหัวผิดพลาด"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "เชื่อมต่อไม่สำเร็จ"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
@@ -2083,25 +2078,18 @@ msgstr "ข้อผิดพลาดภายใน"
msgid "Can't mmap an empty file"
msgstr "ไม่สามารถ mmap à¹à¸Ÿà¹‰à¸¡à¹€à¸›à¸¥à¹ˆà¸²"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2487,14 +2475,14 @@ msgstr "ไม่รู้จัà¸à¸Šà¸™à¸´à¸” '%s' ที่บรรทัด
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "บรรทัด %u ในà¹à¸Ÿà¹‰à¸¡à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸­à¹à¸«à¸¥à¹ˆà¸‡à¹à¸žà¸à¹€à¸à¸ˆ %s ผิดรูปà¹à¸šà¸š (id ผู้ผลิต)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2506,7 +2494,7 @@ msgstr ""
"ซึ่งà¹à¸žà¸à¹€à¸à¸ˆà¸”ังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹à¸žà¸à¹€à¸à¸ˆà¸—ี่จำเป็นสำหรับระบบ à¸à¸²à¸£à¸¥à¸šà¸”ังà¸à¸¥à¹ˆà¸²à¸§à¸¡à¸±à¸à¹€à¸›à¹‡à¸™à¸­à¸±à¸™à¸•à¸£à¸²à¸¢ "
"à¹à¸•à¹ˆà¸–้าคุณต้องà¸à¸²à¸£à¸—ำเช่นนั้นจริงๆ à¸à¹‡à¹ƒà¸«à¹‰à¹€à¸›à¸´à¸”ตัวเลือภAPT::Force-LoopBreak"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2579,12 +2567,12 @@ msgstr "ไม่สามารถเรียà¸à¸—ำงานวิธีà¸
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "à¸à¸£à¸¸à¸“าใส่à¹à¸œà¹ˆà¸™à¸Šà¸·à¹ˆà¸­: '%s' ลงในไดรว์ '%s' à¹à¸¥à¹‰à¸§à¸à¸” enter"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ไม่รองรับระบบà¹à¸žà¸à¹€à¸à¸ˆ '%s'"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "ไม่สามารถระบุชนิดของระบบà¹à¸žà¸à¹€à¸à¸ˆà¸—ี่เหมาะสมได้"
@@ -2717,39 +2705,39 @@ msgstr "เà¸à¸´à¸”ข้อผิดพลาด IO ขณะบันทึà¸
msgid "rename failed, %s (%s -> %s)."
msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum ไม่ตรงà¸à¸±à¸™"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "ผลรวมà¹à¸®à¸Šà¹„ม่ตรงà¸à¸±à¸™"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีà¸à¸¸à¸à¹à¸ˆà¸ªà¸²à¸˜à¸²à¸£à¸“ะสำหรับà¸à¸¸à¸à¹à¸ˆà¸«à¸¡à¸²à¸¢à¹€à¸¥à¸‚ต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, 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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "ไม่พบà¹à¸Ÿà¹‰à¸¡à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸žà¸à¹€à¸à¸ˆ %s คุณอาจต้องà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹à¸žà¸à¹€à¸à¸ˆà¸™à¸µà¹‰à¹€à¸­à¸‡"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "à¹à¸Ÿà¹‰à¸¡à¸”ัชนีà¹à¸žà¸à¹€à¸à¸ˆà¹€à¸ªà¸µà¸¢à¸«à¸²à¸¢ ไม่มีข้อมูล Filename: (ชื่อà¹à¸Ÿà¹‰à¸¡) สำหรับà¹à¸žà¸à¹€à¸à¸ˆ %s"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงà¸à¸±à¸™"
@@ -2882,78 +2870,101 @@ msgstr "เขียนà¹à¸¥à¹‰à¸§ %i ระเบียน โดยมีà¹à
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "เขียนà¹à¸¥à¹‰à¸§ %i ระเบียน โดยมีà¹à¸Ÿà¹‰à¸¡à¸‚าดหาย %i à¹à¸Ÿà¹‰à¸¡ à¹à¸¥à¸°à¹à¸Ÿà¹‰à¸¡à¸œà¸´à¸”ขนาด %i à¹à¸Ÿà¹‰à¸¡\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "ขณะเปิดà¹à¸Ÿà¹‰à¸¡à¸„่าตั้ง %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "ผลรวมà¹à¸®à¸Šà¹„ม่ตรงà¸à¸±à¸™"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้ง %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸±à¹‰à¸‡à¸„่า %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸–อดถอน %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "ถอดถอน %s อย่างสมบูรณ์à¹à¸¥à¹‰à¸§"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸£à¸µà¸¢à¸à¸à¸²à¸£à¸ªà¸°à¸à¸´à¸” %s หลังà¸à¸²à¸£à¸•à¸´à¸”ตั้ง"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "ไม่มีไดเรà¸à¸—อรี '%s'"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡ %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹à¸•à¸à¹à¸žà¸à¹€à¸à¸ˆ %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸•à¸±à¹‰à¸‡à¸„่า %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "ติดตั้ง %s à¹à¸¥à¹‰à¸§"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸–อดถอน %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "ถอดถอน %s à¹à¸¥à¹‰à¸§"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸–อดถอน %s อย่างสมบูรณ์"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์à¹à¸¥à¹‰à¸§"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ไม่สามารถเขียนบันทึà¸à¸›à¸à¸´à¸šà¸±à¸•à¸´à¸à¸²à¸£ เนื่องจาภopenpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
"หรือเปล่า?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2979,26 +2990,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "ไม่สามารถà¹à¸žà¸•à¸Šà¹Œà¹à¸Ÿà¹‰à¸¡"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­à¸–ูà¸à¸›à¸´à¸”à¸à¹ˆà¸­à¸™à¹€à¸§à¸¥à¸²à¸­à¸±à¸™à¸„วร"
-#~ msgid "Could not patch file"
-#~ msgstr "ไม่สามารถà¹à¸žà¸•à¸Šà¹Œà¹à¸Ÿà¹‰à¸¡"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/tl.po b/po/tl.po
index b737f64d2..03799ebea 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -150,14 +150,9 @@ msgstr " Naka-Pin na Pakete: "
msgid " Version table:"
msgstr " Talaang Bersyon:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
@@ -662,7 +657,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -827,11 +822,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -863,8 +858,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -901,7 +896,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -910,7 +905,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -1009,50 +1004,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1068,46 +1063,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1110,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1126,115 +1121,115 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1243,7 +1238,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1252,32 +1247,32 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1360,7 +1355,7 @@ msgstr ""
"para sa karagdagang impormasyon at mga option.\n"
" Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1612,7 +1607,7 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1780,11 +1775,11 @@ msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -1793,34 +1788,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Pumapasok"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Hindi malaman ang pangalan ng peer"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Hindi malaman ang pangalang lokal"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Bigo ang PASS, sabi ng server ay: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1828,114 +1823,114 @@ msgstr ""
"May tinakdang katuwang na server ngunit walang login script, walang laman "
"ang Acquire::ftp::ProxyLogin."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Bigo ang TYPE, sabi ng server ay: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Lumipas ang koneksyon"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Sinarhan ng server ang koneksyon"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Error sa pagbasa"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "May sagot na bumubo sa buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Sira ang protocol"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Error sa pagsulat"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Hindi maka-likha ng socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Hindi maka-konekta sa socket na passive."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "di makakuha ang getaddrinfo ng socket na nakikinig"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Hindi maka-bind ng socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Hindi makarinig sa socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Hindi malaman ang pangalan ng socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Hindi makapagpadala ng utos na PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Di kilalang pamilya ng address %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Bigo ang EPRT, sabi ng server ay: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Nag-timeout ang socket ng datos"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Nag-timeout ang socket ng datos"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Tanong"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Hindi ma-invoke "
@@ -2050,81 +2045,81 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
msgid "Read error from %s process"
msgstr "Error sa pagbasa mula sa prosesong %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Naghihintay ng panimula"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Maling linyang panimula"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Bigo sa pagsulat ng talaksang %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Internal na error"
@@ -2132,25 +2127,18 @@ msgstr "Internal na error"
msgid "Can't mmap an empty file"
msgstr "Hindi mai-mmap ang talaksang walang laman"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Hindi makagawa ng mmap ng %lu na byte"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2543,14 +2531,14 @@ msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2562,7 +2550,7 @@ msgstr ""
"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
"activate ang APT::Force-LoopBreak na option."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2641,12 +2629,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2785,20 +2773,20 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2807,7 +2795,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2816,7 +2804,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2824,7 +2812,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2960,76 +2948,98 @@ msgstr ""
"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
"mismatch\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Binubuksan ang talaksang pagsasaayos %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Di tugmang MD5Sum"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Isasaayos ang %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Tinatanggal ang %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Natanggal ng lubusan ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Nawawala ang directory ng talaan %spartial."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Hinahanda ang %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Binubuklat ang %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Hinahanda ang %s upang isaayos"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Naghahanda para sa pagtanggal ng %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Tinanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3055,26 +3065,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Hindi mai-patch ang talaksan"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Nagsara ng maaga ang koneksyon"
-#~ msgid "Could not patch file"
-#~ msgstr "Hindi mai-patch ang talaksan"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/uk.po b/po/uk.po
index e8a750ce2..976b44b44 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2006-07-29 15:57+0300\n"
"Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: УкраїнÑька <uk@li.org>\n"
@@ -146,14 +146,9 @@ msgstr " ФікÑатор(pin) пакунка: "
msgid " Version table:"
msgstr " Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð²ÐµÑ€Ñій:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s Ð´Ð»Ñ %s %s Ñкомпільовано %s %s\n"
@@ -660,7 +655,7 @@ msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ %s в %s"
msgid "Y"
msgstr "Т"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компілÑції регулÑрного виразу - %s"
@@ -825,11 +820,11 @@ msgstr "Пакунки необхідно видалити, але видалеÐ
msgid "Internal error, Ordering didn't finish"
msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, Ordering не завершилаÑÑ"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Ðеможливо заблокувати теку Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Ðеможливо прочитати перелік джерел."
@@ -859,8 +854,8 @@ msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
"ПіÑÐ»Ñ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'єм зайнÑтого диÑкового проÑтору зменшитьÑÑ Ð½Ð° %sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ кількіÑÑ‚ÑŒ вільного міÑÑ†Ñ Ð² %s"
@@ -899,7 +894,7 @@ msgstr "Перервано."
msgid "Do you want to continue [Y/n]? "
msgstr "Бажаєте продовжити [Т/н]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ %s %s\n"
@@ -908,7 +903,7 @@ msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ %s %s\n"
msgid "Some files failed to download"
msgstr "ДеÑкі файли не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Вказано режим \"тільки завантаженнÑ\", Ñ– Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
@@ -1009,50 +1004,50 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Обрана верÑÑ–Ñ %s (%s) Ð´Ð»Ñ %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ атрибути переліку вихідних текÑтів%s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Команді update не потрібні аргументи"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Ðеможливо заблокувати теку з переліками пакунків"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "ÐОВІ пакунки були вÑтановлені автоматично Ñ– більше не потрібні:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "ÐОВІ пакунки були вÑтановлені автоматично Ñ– більше не потрібні:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ВикориÑтовуйте 'apt-get autoremove' щоб видалити Ñ—Ñ…."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1070,46 +1065,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "ÐаÑтупна Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ допоможе Вам:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, вирішувач проблем вÑе поламав"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, AllUpgrade вÑе поламав"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ðе можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Ðе можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Помітьте, регулÑрний вираз %2$s призводить до вибору %1$s\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "але %s буде вÑтановлений"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Можливо, Ð´Ð»Ñ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ñ†Ð¸Ñ… помилок Ви захочете ÑкориÑтатиÑÑ 'apt-get -f "
"install':"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1117,7 +1112,7 @@ msgstr ""
"Ðезадоволені залежноÑÑ‚Ñ–. Спробуйте виконати 'apt-get -f install', не "
"вказуючи імені пакунка (або знайдіть інше рішеннÑ)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1128,121 +1123,121 @@ msgstr ""
"або ж викориÑтаєте неÑтабільний диÑтрибутив, Ñ– запитані Вами пакунки\n"
"ще не Ñтворені або були вилучені з Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Зламані пакунки"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Будуть вÑтановлені наÑтупні додаткові пакунки:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Пропоновані пакунки:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Рекомендовані пакунки:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "ОбчиÑÐ»ÐµÐ½Ð½Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½ÑŒ... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Ðевдача"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Виконано"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, вирішувач проблем вÑе поламав"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть Ñк мінімум один пакунок, Ð´Ð»Ñ Ñкого необхідно завантажити вихідні "
"текÑти"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ðеможливо знайти пакунок з вихідними текÑтами Ð´Ð»Ñ %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ПропуÑкаємо вже завантажений файл '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ÐедоÑтатньо міÑÑ†Ñ Ð² %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ðеобхідно завантажити %sB/%sB з архівів вихідних текÑтів.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текÑтами.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ñ… текÑтів %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "ДеÑкі архіви не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Ð Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ñ… текÑтів пропущено, тому що в %s вже перебувають "
"розпаковані вихідні текÑти\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ '%s' завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи вÑтановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Породжений Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ залежноÑтей Ð´Ð»Ñ Ð¿Ð¾Ð±ÑƒÐ´Ð¾Ð²Ð¸ необхідно вказати Ñк мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ðеможливо одержати інформацію про залежноÑÑ‚Ñ– Ð´Ð»Ñ Ð¿Ð¾Ð±ÑƒÐ´Ð¾Ð²Ð¸ %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежноÑтей Ð´Ð»Ñ Ð¿Ð¾Ð±ÑƒÐ´Ð¾Ð²Ð¸.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1250,7 +1245,7 @@ msgid ""
msgstr ""
"ЗалежніÑÑ‚ÑŒ типу %s Ð´Ð»Ñ %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1259,32 +1254,32 @@ msgstr ""
"ЗалежніÑÑ‚ÑŒ типу %s Ð´Ð»Ñ %s не може бути задоволена, бо ні одна з верÑій "
"пакунка %s не задовольнÑÑ” умови"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ðе вдалоÑÑ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑŒÐ½Ð¸Ñ‚Ð¸ залежніÑÑ‚ÑŒ типу %s Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° %s: Ð’Ñтановлений "
"пакунок %s новіше, аніж треба"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ðеможливо задовольнити залежніÑÑ‚ÑŒ типу %s Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ЗалежноÑÑ‚Ñ– Ð´Ð»Ñ Ð¿Ð¾Ð±ÑƒÐ´Ð¾Ð²Ð¸ %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Обробка залежноÑтей Ð´Ð»Ñ Ð¿Ð¾Ð±ÑƒÐ´Ð¾Ð²Ð¸ закінчилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1371,7 +1366,7 @@ msgstr ""
"міÑÑ‚ÑÑ‚ÑŒ більше інформації.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1625,7 +1620,7 @@ msgstr "Файл %s/%s перезапиÑує інший з пакету %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1795,11 +1790,11 @@ msgid "File not found"
msgstr "Файл не знайдено"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Ðе вдалоÑÑ Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚Ð¸ атрибути"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Ðе вдалоÑÑ Ð²Ñтановити Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
@@ -1808,34 +1803,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Ðевірне поÑиланнÑ, локальні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– починатиÑÑ Ð· //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "ЛогінюÑÑŒ в"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Ðеможливо визначити назву вузла"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Ðеможливо визначити локальну назву"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Сервер розірвав з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ– мовив: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER невдало, Ñервер мовив: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS невдало, Ñервер мовив: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1843,116 +1838,116 @@ msgstr ""
"Вказано прокÑÑ–-Ñервер, але відÑутній Ñкрипт логіну, Acquire::ftp::ProxyLogin "
"пуÑтий."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Команда '%s'Ñкрипту логіна не вдалаÑÑ, Ñервер мовив: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE невдало, Ñервер мовив: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Ð§Ð°Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð²ÑÑ"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Сервер закрив з'єднаннÑ"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Помилка читаннÑ"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Відповідь переповнила буфер."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Спотворений протокол"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Помилка запиÑу"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Ðеможливо Ñтворити Ñокет (socket)"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Ðеможливо під'єднати Ñокет (socket) з даними, Ñ‡Ð°Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð²ÑÑ"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Ðеможливо під'єднати паÑивний Ñокет (passive socket)."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
#, fuzzy
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Виклик getaddrinfo не зміг отримати Ñокет"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Ðеможливо приєднатиÑÑ Ð´Ð¾ Ñокета"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
#, fuzzy
msgid "Could not listen on the socket"
msgstr "Ðе можливо утримувати з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð° Ñокеті"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ назву Ñокета"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Ðеможливо відіÑлати команду PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Ðевідоме адреÑове ÑімейÑтво %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT невдало, Ñервер мовив: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Ð§Ð°Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Ñокетом даних вичерпавÑÑ"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Ðеможливо прийнÑти з'єднаннÑ"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема Ñ…ÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Ðеможливо завантажити файл, Ñервер мовив: '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Ð§Ð°Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Ñокетом (socket) з даними вичерпавÑÑ"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Передача даних обірвалаÑÑ, Ñервер мовив '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Черга"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Ðеможливо викликати "
@@ -2065,83 +2060,83 @@ msgstr "Ðеможливо відкрити канал (pipe) Ð´Ð»Ñ %s"
msgid "Read error from %s process"
msgstr "Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð· процеÑу %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° заголовки"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Отримано одну заголовкову лінію понад %u Ñимволів"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Ðевірна Ð»Ñ–Ð½Ñ–Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÑƒ"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP Ñервер відіÑлав невірний заголовок 'reply'"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP Ñервер відіÑлав невірний заголовок 'Content-Length'"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP Ñервер відіÑлав невірний заголовок 'Content-Length'"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Цей HTTP Ñервер має поламану підтримку 'range'"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Ðевідомий формат дати"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Вибір не вдавÑÑ"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Ð§Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ð¸Ð¹ÑˆÐ¾Ð²"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Помилка запиÑу в вихідний файл"
-#: methods/http.cc:847
+#: methods/http.cc:849
#, fuzzy
msgid "Error writing to file"
msgstr "Помилка запиÑу в файл"
-#: methods/http.cc:875
+#: methods/http.cc:877
#, fuzzy
msgid "Error writing to the file"
msgstr "Помилка запиÑу в файл"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð· Ñервера. Віддалена Ñторона закрила з'єднаннÑ"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð· Ñервера"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#, fuzzy
msgid "Failed to truncate file"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Погана заголовкова інформаціÑ"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ðµ вдалоÑÑ"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°"
@@ -2149,25 +2144,18 @@ msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°"
msgid "Can't mmap an empty file"
msgstr "Ðеможливо відобразити в пам'ÑÑ‚Ñ– пуÑтий файл"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ðеможливо відобразити в пам'ÑÑ‚Ñ– %lu байт"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2562,14 +2550,14 @@ msgstr "Ðевідомий тип '%s' в лінії %u в переліку дж
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Спотворена Ð»Ñ–Ð½Ñ–Ñ %u у переліку джерел %s (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2581,7 +2569,7 @@ msgstr ""
"погано, але Ñкщо Ви дійÑно бажаєте зробити це, активуйте параметр APT::Force-"
"LoopBreak."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2659,12 +2647,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Будь-лаÑка, вÑтавте диÑк з поміткою: '%s' в CD привід '%s' Ñ– натиÑніть Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "СиÑтема Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ '%s' не підтримуєтьÑÑ"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Ðеможливо визначити тип необхідної ÑиÑтеми Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ "
@@ -2799,21 +2787,21 @@ msgstr "Помилка IO під Ñ‡Ð°Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð¶ÐµÑ€ÐµÐ»ÑŒÐ½Ð¾Ð
msgid "rename failed, %s (%s -> %s)."
msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "ÐевідповідніÑÑ‚ÑŒ MD5Sum"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ÐевідповідніÑÑ‚ÑŒ MD5Sum"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "ВідÑутній публічний ключ Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ… ID ключа:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2822,7 +2810,7 @@ msgstr ""
"Я не можу знайти файл Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s. Можливо, Ви захочете влаÑноруч "
"виправити цей пакунок. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2831,14 +2819,14 @@ msgstr ""
"Я не можу знайти файл Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s. Можливо, Ви захочете влаÑноруч "
"виправити цей пакунок."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ІндекÑні файли пакунків пошкоджені. Ðемає Ð¿Ð¾Ð»Ñ Filename Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "ÐевідповідніÑÑ‚ÑŒ розміру"
@@ -2970,77 +2958,99 @@ msgstr "ЗапиÑано %i запиÑів з %i невідповідними Ñ„
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "ЗапиÑано %i запиÑів з %i відÑутніми Ñ– %i невідповідними файлами\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "ВідкриваєтьÑÑ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ð¹Ð½Ð¸Ð¹ файл %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "ÐевідповідніÑÑ‚ÑŒ MD5Sum"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Ð’Ñтановлено %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "ВидалÑєтьÑÑ %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "ПовніÑÑ‚ÑŽ видалено %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Lists тека %spartial відÑутнÑ."
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Підготовка %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Ð Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Підготовка до конфігурації %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Ð’Ñтановлено %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Підготовка до Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Підготовка до повного Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "ПовніÑÑ‚ÑŽ видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ðеможливо запиÑати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3066,26 +3076,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Ðеможливо наклаÑти латку на файл"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾ передчаÑно"
-#~ msgid "Could not patch file"
-#~ msgstr "Ðеможливо наклаÑти латку на файл"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/vi.po b/po/vi.po
index abbb2dc1c..07e7870fe 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2008-12-22 19:04+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -146,15 +146,9 @@ msgstr " Ghim gói: "
msgid " Version table:"
msgstr " Bảng phiên bản:"
-# Variable: do not translate/ biến: đừng dịch
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s cho %s được biên dịch trên %s %s\n"
@@ -679,7 +673,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
msgid "Y"
msgstr "C"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
@@ -842,11 +836,11 @@ msgstr "Cần phải gỡ bá» má»™t số gói, nhÆ°ng mà khả năng Gỡ bá»
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thÆ° mục tải vá»"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Không thể Ä‘á»c danh sách nguồn."
@@ -876,8 +870,8 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -915,7 +909,7 @@ msgstr "Hủy bá»."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
@@ -924,7 +918,7 @@ msgstr "Việc gói %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải vỠđược"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "Má»›i tải vá» xong và trong chế Ä‘á»™ chỉ tải vá»"
@@ -1024,51 +1018,51 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "Äã chá»n phiên bản %s (%s) cho %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Không thể lấy các thông tin vỠdanh sách gói nguồn %s"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "Lệnh cập nhật không chấp nhật đối số"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "Không thể khóa thư mục danh sách"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỠTự động"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỠchúng."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1086,43 +1080,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trÆ°á»ng hợp:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Lỗi nội bộ : Bộ Gỡ bỠTự động đã làm hư gì."
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "Không tìm thấy tác vụ %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Ghi chú : Ä‘ang chá»n %s cho biểu thức chính quy « %s »\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1130,7 +1124,7 @@ msgstr ""
"Gói còn phụ thuá»™c vào phần má»m chÆ°a có. Hãy cố chạy lệnh « apt-get -f install "
"» mà không có gói nào (hoặc ghi rõ cách quyết định)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1142,123 +1136,123 @@ msgstr ""
"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
"hoặc chÆ°a di chuyển chúng ra phần Incoming (Äến)."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "Gói bị ngắt"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "Äang tính nâng cấp... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đỠđã ngắt gì"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Äang bá» qua tập tin đã được tải vỠ« %s »\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Äang bá» qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin vỠcách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuá»™c %s cho %s không thể được thá»a vì không tìm thấy gá»i %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1267,31 +1261,31 @@ msgstr ""
"cách phụ thuá»™c %s cho %s không thể được thá»a vì không có phiên bản sẵn sàng "
"của gói %s có thể thá»a Ä‘iá»u kiện phiên bản."
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thá»a cách phụ thuá»™c %s cho %s bị lá»—i vì gói đã cài đặt %s quá má»›i"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thá»a cách phụ thuá»™c %s cho %s bị lá»—i: %s."
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thá»a cách phụ thuá»™c khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1383,7 +1377,7 @@ msgstr ""
"sources.list(5) và apt.conf(5).\n"
" Trình APT này có năng lực của siêu bò.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1637,7 +1631,7 @@ msgstr "Tập tin %s/%s ghi đè lên Ä‘iá»u trong gói %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1808,11 +1802,11 @@ msgid "File not found"
msgstr "Không tìm thấy tập tin"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Việc lấy các thông tin bị lỗi"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Việc lập giỠsửa đổi bị lỗi"
@@ -1821,34 +1815,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Äịa chỉ URI không hợp lệ: URI không thể bắt đầu vá»›i « // »"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Äang đăng nhập..."
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Không thể quyết định tên ngang hàng"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Không thể quyết định tên cục bộ"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Lệnh USER (ngÆ°á»i dùng) đã thất bại: máy phục vụ nói: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1856,114 +1850,114 @@ msgstr ""
"Äã ghi rõ máy phục vụ ủy nhiệm, nhÆ°ng mà chÆ°a ghi rõ tập lệnh đăng nhập. « "
"Acquire::ftp::ProxyLogin » là rỗng."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Lệnh tập lệnh đăng nhập « %s » đã thất bại: máy phục vụ nói: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Thá»i hạn kết nối"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Máy phục vụ đã đóng kết nối"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Lá»—i Ä‘á»c"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Má»™t trả lá»i đã tràn bá»™ đệm."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Giao thức bị há»ng"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Lá»—i ghi"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Không thể tạo ổ cắm"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giá»"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Không thể kết nối ổ cắm bị động."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Không thể đóng kết ổ cắm"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Không thể lắng nghe trên ổ cắm đó"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Không thể quyết định tên ổ cắm đó"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Không thể gởi lệnh PORT (cổng)"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Không biết nhóm địa chỉ %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Kết nối ổ cắm dữ liệu đã quá giá»"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Gặp khó khăn băm tập tin"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "á»” cắm dữ liệu đã quá giá»"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Việc truyá»n dữ liệu bị lá»—i: máy phục vụ nói « %s »"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Truy vấn"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Không thể gá»i "
@@ -2073,84 +2067,84 @@ msgstr "Không thể mở ống dẫn cho %s"
msgid "Read error from %s process"
msgstr "Gặp lá»—i Ä‘á»c từ tiến trình %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Äang đợi những phần đầu..."
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Äã lấy má»™t dòng đầu riêng lẻ chứa hÆ¡n %u ky tá»±"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Dòng đầu sai"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Máy phục vụ HTTP đã gởi má»™t dòng đầu trả lá»i không hợp lệ"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
"hợp lệ"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
"hợp lệ"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Không biết dạng ngày"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Việc chá»n bị lá»—i"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Kết nối đã quá giá»"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lá»—i khi Ä‘á»c từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Gặp lá»—i khi Ä‘á»c từ máy phục vụ"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Lỗi cắt ngắn tập tin"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
@@ -2158,25 +2152,18 @@ msgstr "Gặp lỗi nội bộ"
msgid "Can't mmap an empty file"
msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2565,14 +2552,14 @@ msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2584,7 +2571,7 @@ msgstr ""
"bạn thật sá»± muốn tiếp tục, có thể hoạt hóa tuy chá»n « APT::Force-LoopBreak "
"» (buộc ngắt vòng lặp)."
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2659,12 +2646,12 @@ msgstr "Phương pháp %s đã không bắt đầu cho đúng."
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
@@ -2803,19 +2790,19 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
msgid "rename failed, %s (%s -> %s)."
msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Sai khớp tổng băm (hash sum)"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2824,7 +2811,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:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2833,7 +2820,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:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2841,7 +2828,7 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị há»ng. Không có trÆ°á»ng Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
@@ -2975,76 +2962,99 @@ msgstr ""
"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
"nhau\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Äang mở tập tin cấu hình %s..."
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Sai khớp tổng băm (hash sum)"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Äang cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Äang cấu hình %s..."
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Äang gỡ bá» %s..."
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "Mới gỡ bỠhoàn toàn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Äang chạy bá»™ gây nên tiến trình cuối cùng cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Thiếu thư mục « %s »"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Äang chuẩn bị %s..."
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Äang mở gói %s..."
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Äang chuẩn bị cấu hình %s..."
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Äã cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Äang chuẩn bị gỡ bá» %s..."
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Äã gỡ bá» %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Äang chuẩn bị gỡ bá» hoàn toàn %s..."
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Mới gỡ bỠhoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -3070,26 +3080,17 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Không thể vá lỗi trong tập tin %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Kết nối bị đóng quá sớm."
-#~ msgid "Could not patch file"
-#~ msgstr "Không thể vá lỗi trong tập tin %s"
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
# Variable: do not translate/ biến: đừng dịch
#~ msgid "%4i %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 742c5cbe8..8f4e1440c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,14 +3,15 @@
# Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
# Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
+# Aron Xu <happyaron.xu@gmail.com>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-06-01 15:54+0800\n"
-"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"PO-Revision-Date: 2009-12-02 01:00+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgstr " æ··åˆè™šæ‹Ÿè½¯ä»¶åŒ…:"
#: cmdline/apt-cache.cc:289
msgid " Missing: "
-msgstr " 缺æ¼çš„:"
+msgstr " 缺失:"
#: cmdline/apt-cache.cc:291
msgid "Total distinct versions: "
@@ -95,7 +96,7 @@ msgstr "总å ç”¨ç©ºé—´ï¼š"
#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
#, c-format
msgid "Package file %s is out of sync."
-msgstr "软件包文件 %s 尚未åŒæ­¥(sync)。"
+msgstr "软件包文件 %s 尚未åŒæ­¥ã€‚"
#: cmdline/apt-cache.cc:1297
msgid "You must give exactly one pattern"
@@ -103,7 +104,7 @@ msgstr "您必须明确地给出一个表达å¼"
#: cmdline/apt-cache.cc:1451
msgid "No packages found"
-msgstr "没有å‘现å»åˆçš„软件包"
+msgstr "没有å‘现匹é…的软件包"
#: cmdline/apt-cache.cc:1528
msgid "Package files:"
@@ -111,12 +112,12 @@ msgstr "软件包文件:"
#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "缓存尚未åŒæ­¥(sync),无法交差引è¯(x-ref)一个软件包文件"
+msgstr "缓存尚未åŒæ­¥ï¼Œæ— æ³•äº¤å·®å¼•è¯(x-ref)一个软件包文件"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1549
msgid "Pinned packages:"
-msgstr "被é”定(pinned)的软件包:"
+msgstr "被é”定的软件包:"
#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
msgid "(not found)"
@@ -134,28 +135,23 @@ msgstr "(æ— )"
#. Candidate Version
#: cmdline/apt-cache.cc:1589
msgid " Candidate: "
-msgstr " 候选的软件包:"
+msgstr " 候选软件包:"
#: cmdline/apt-cache.cc:1599
msgid " Package pin: "
-msgstr " 软件包é”(Pin):"
+msgstr " 软件包é”:"
#. Show the priority tables
#: cmdline/apt-cache.cc:1608
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s 编译于 %s %s\n"
+msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
#: cmdline/apt-cache.cc:1725
msgid ""
@@ -196,25 +192,25 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"用法: apt-cache [选项] 命令\n"
-" apt-cache [选项] add 文件甲 [文件乙 ...]\n"
-" apt-cache [选项] showpkg 软件包甲 [软件包乙 ...]\n"
-" apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
+"    apt-cache [选项] add 文件1 [文件2 ...]\n"
+"    apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
+"    apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
"\n"
"apt-cache 是一个底层的工具,我们用它æ¥æ“纵 APT 的二进制\n"
"缓存文件,也用æ¥åœ¨é‚£äº›æ–‡ä»¶ä¸­æŸ¥è¯¢ç›¸å…³ä¿¡æ¯\n"
"\n"
"命令:\n"
-" add - å¾€æºç¼“存加入一个软件包文件\n"
-" gencaches - 一并生æˆè½¯ä»¶åŒ…å’Œæºä»£ç åŒ…的缓存\n"
+" add - å‘æºç¼“存加入一个软件包文件\n"
+" gencaches - åŒæ—¶ç”Ÿæˆè½¯ä»¶åŒ…å’Œæºä»£ç åŒ…的缓存\n"
" showpkg - 显示æŸä¸ªè½¯ä»¶åŒ…çš„å…¨é¢ä¿¡æ¯\n"
" showsrc - 显示æºæ–‡ä»¶çš„å„项记录\n"
-" stats - 显示一些基本的统计信æ¯\n"
+" stats - 显示基本的统计信æ¯\n"
" dump - 简è¦æ˜¾ç¤ºæ•´ä¸ªç¼“存文件的内容\n"
" dumpavail - 把所有有效的包文件列表打å°åˆ°æ ‡å‡†è¾“出\n"
" unmet - 显示所有未满足的ä¾èµ–关系\n"
" search - æ ¹æ®æ­£åˆ™è¡¨è¾¾å¼æœç´¢è½¯ä»¶åŒ…列表\n"
" show - 以便于阅读的格å¼ä»‹ç»è¯¥è½¯ä»¶åŒ…\n"
-" depends - 原原本本地显示该软件包的ä¾èµ–ä¿¡æ¯\n"
+" depends - 显示该软件包的ä¾èµ–关系信æ¯\n"
" rdepends - 显示所有ä¾èµ–于该软件包的软件包åå­—\n"
" pkgnames - 列出所有软件包的åå­—\n"
" dotty - 生æˆå¯ç”¨ GraphViz 处ç†çš„软件包关系图\n"
@@ -232,17 +228,16 @@ msgstr ""
"è‹¥è¦äº†è§£æ›´å¤šä¿¡æ¯ï¼Œæ‚¨è¿˜å¯ä»¥æŸ¥é˜… apt-cache(8) å’Œ apt.conf(5) å‚考手册。\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "请给这张光盘起个å字,比如说“Debian 2.1r1 Disk 1â€"
+msgstr "请给这张盘片起个å字,比如“Debian 5.0.3 Disk 1â€"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
-msgstr "请把光盘碟片æ’入驱动器å†æŒ‰å›žè½¦é”®"
+msgstr "请把盘片æ’入驱动器å†æŒ‰å›žè½¦é”®"
#: cmdline/apt-cdrom.cc:114
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "请对您的光盘套件中的其它光盘é‡å¤ç›¸åŒçš„æ“作。"
+msgstr "请对您的盘片套件中的其它盘片é‡å¤ç›¸åŒçš„æ“作。"
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -265,7 +260,7 @@ msgid ""
msgstr ""
"用法:apt-config [选项] 命令\n"
"\n"
-"apt-config æ˜¯ä¸€ä¸ªç”¨äºŽè¯»å– APT é…置文件的简å•å·¥å…·\n"
+"apt-config 是一个用于读å–APT é…置文件的简å•å·¥å…·\n"
"\n"
"命令:\n"
" shell - Shell 模å¼\n"
@@ -312,11 +307,11 @@ msgstr "无法写入 %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf �"
+msgstr "无法获得 debconf 的版本。您安装了 debconf å—?"
#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
-msgstr "软件包的扩展列表超长"
+msgstr "软件包的扩展列表太长"
#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
@@ -327,16 +322,16 @@ msgstr "处ç†ç›®å½• %s 时出错"
#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
-msgstr "æºæ‰©å±•åˆ—表超长"
+msgstr "æºæ‰©å±•åˆ—表太长"
#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
-msgstr "将 header 写到 contents 文件时出错"
+msgstr "将头写入到目录文件时出错"
#: ftparchive/apt-ftparchive.cc:398
#, c-format
msgid "Error processing contents %s"
-msgstr "å¤„ç† Contents %s 时出错"
+msgstr "处ç†ç›®å½• %s 时出错"
#: ftparchive/apt-ftparchive.cc:553
msgid ""
@@ -430,38 +425,38 @@ msgstr "软件包文件组“%sâ€ä¸­ç¼ºå°‘一些文件"
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "缓存数æ®åº“被æŸå了,该数æ®åº“文件的文件åå·²æ”¹æˆ %s.old"
+msgstr "æ•°æ®åº“被æŸå,该数æ®åº“文件的文件åå·²æ”¹æˆ %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 已过时,现试图进行å‡çº§ %s"
+msgstr "æ•°æ®åº“已过期,现å°è¯•è¿›è¡Œå‡çº§ %s"
#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-"DB æ ¼å¼æ˜¯æ— æ•ˆçš„。如果你是从一个è€ç‰ˆæœ¬çš„ apt å‡çº§è€Œæ¥ï¼Œè¯·åˆ é™¤æ•°æ®åº“并é‡å»ºå®ƒã€‚"
+"æ•°æ®åº“æ ¼å¼æ— æ•ˆã€‚如果您是从一个è€ç‰ˆæœ¬çš„ apt å‡çº§è€Œæ¥ï¼Œè¯·åˆ é™¤æ•°æ®åº“并é‡å»ºå®ƒã€‚"
#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "无法打开 DB 文件 %s:%s"
+msgstr "无法打开数æ®åº“文件 %s:%s"
#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
#, c-format
msgid "Failed to stat %s"
-msgstr "æ— æ³•è¯»å– %s 的状æ€"
+msgstr "无法获得 %s 的状æ€"
#: ftparchive/cachedb.cc:238
msgid "Archive has no control record"
-msgstr "存档没有包å«æŽ§åˆ¶å­—段"
+msgstr "归档文件没有包å«æŽ§åˆ¶å­—段"
#: ftparchive/cachedb.cc:444
msgid "Unable to get a cursor"
-msgstr "无法获得游标(cursor)"
+msgstr "无法获得游标"
#: ftparchive/writer.cc:76
#, c-format
@@ -471,7 +466,7 @@ msgstr "警告:无法读å–目录 %s\n"
#: ftparchive/writer.cc:81
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "警告:无法对 %s 进行统计\n"
+msgstr "警告:无法获得 %s 的状æ€\n"
#: ftparchive/writer.cc:132
msgid "E: "
@@ -488,7 +483,7 @@ msgstr "错误:处ç†æ–‡ä»¶æ—¶å‡ºé”™ "
#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
#, c-format
msgid "Failed to resolve %s"
-msgstr "无法解æžè·¯å¾„ %s"
+msgstr "æ— æ³•è§£æž %s"
#: ftparchive/writer.cc:170
msgid "Tree walking failed"
@@ -512,7 +507,7 @@ msgstr "无法读å–符å·é“¾æŽ¥ %s"
#: ftparchive/writer.cc:266
#, c-format
msgid "Failed to unlink %s"
-msgstr "无法 unlink %s"
+msgstr "无法使用 unlink 删除 %s"
#: ftparchive/writer.cc:273
#, c-format
@@ -526,7 +521,7 @@ msgstr " 达到了 DeLink çš„ä¸Šé™ %sB。\n"
#: ftparchive/writer.cc:388
msgid "Archive had no package field"
-msgstr "存档没有包å«è½¯ä»¶åŒ…(package)字段"
+msgstr "å½’æ¡£æ–‡ä»¶æ²¡æœ‰åŒ…å« package 字段"
#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
#, c-format
@@ -555,7 +550,7 @@ msgstr "内部错误,无法定ä½åŒ…内文件 %s"
#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 无法å†åˆ†é…内存"
+msgstr "realloc - 分é…内存失败"
#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
@@ -611,11 +606,11 @@ msgstr "压缩å­è¿›ç¨‹"
#: ftparchive/multicompress.cc:235
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "内部错误,无法建立 %s"
+msgstr "内部错误,无法创建 %s"
#: ftparchive/multicompress.cc:286
msgid "Failed to create subprocess IPC"
-msgstr "无法建立å­è¿›ç¨‹çš„ IPC 管é“"
+msgstr "无法创建å­è¿›ç¨‹çš„ IPC 管é“"
#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
@@ -631,12 +626,12 @@ msgstr "无法对å­è¿›ç¨‹æˆ–文件进行读写"
#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时,无法读å–æ•°æ®"
+msgstr "在计算 MD5 校验和时无法读å–æ•°æ®"
#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
-msgstr "在 unlink %s 时出错"
+msgstr "在使用 unlink 删除 %s 时出错"
#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
@@ -647,19 +642,19 @@ msgstr "无法将 %s é‡å‘½å为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达å¼æ—¶å‡ºé”™ - %s"
#: cmdline/apt-get.cc:244
msgid "The following packages have unmet dependencies:"
-msgstr "下列的软件包有ä¸èƒ½æ»¡è¶³çš„ä¾èµ–关系:"
+msgstr "下列软件包有未满足的ä¾èµ–关系:"
#: cmdline/apt-get.cc:334
#, c-format
msgid "but %s is installed"
-msgstr "但是 %s å·²ç»å®‰è£…了"
+msgstr "但是 %s å·²ç»å®‰è£…"
#: cmdline/apt-get.cc:336
#, c-format
@@ -668,11 +663,11 @@ msgstr "但是 %s æ­£è¦è¢«å®‰è£…"
#: cmdline/apt-get.cc:343
msgid "but it is not installable"
-msgstr "但å´æ— æ³•å®‰è£…它"
+msgstr "但无法安装它"
#: cmdline/apt-get.cc:345
msgid "but it is a virtual package"
-msgstr "但是它åªæ˜¯ä¸ªè™šæ‹Ÿè½¯ä»¶åŒ…"
+msgstr "但是它是虚拟软件包"
#: cmdline/apt-get.cc:348
msgid "but it is not installed"
@@ -696,11 +691,11 @@ msgstr "下列软件包将被ã€å¸è½½ã€‘:"
#: cmdline/apt-get.cc:430
msgid "The following packages have been kept back:"
-msgstr "下列的软件包的版本将ä¿æŒä¸å˜ï¼š"
+msgstr "下列软件包的版本将ä¿æŒä¸å˜ï¼š"
#: cmdline/apt-get.cc:451
msgid "The following packages will be upgraded:"
-msgstr "下列的软件包将被å‡çº§ï¼š"
+msgstr "下列软件包将被å‡çº§ï¼š"
#: cmdline/apt-get.cc:472
msgid "The following packages will be DOWNGRADED:"
@@ -720,18 +715,18 @@ msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"ã€è­¦å‘Šã€‘:下列的基础软件包将被å¸è½½ã€‚\n"
+"ã€è­¦å‘Šã€‘:下列基础软件包将被å¸è½½ã€‚\n"
"请勿å°è¯•ï¼Œé™¤éžæ‚¨ç¡®å®žçŸ¥é“您在åšä»€ä¹ˆï¼"
#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "å…±å‡çº§äº† %lu 个软件包,新安装了 %lu 个软件包,"
+msgstr "å‡çº§äº† %lu 个软件包,新安装了 %lu 个软件包,"
#: cmdline/apt-get.cc:588
#, c-format
msgid "%lu reinstalled, "
-msgstr "å…±é‡æ–°å®‰è£…了 %lu 个软件包,"
+msgstr "é‡æ–°å®‰è£…了 %lu 个软件包,"
#: cmdline/apt-get.cc:590
#, c-format
@@ -741,7 +736,7 @@ msgstr "é™çº§äº† %lu 个软件包,"
#: cmdline/apt-get.cc:592
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "è¦å¸è½½ %lu 个软件包,有 %lu 个软件未被å‡çº§ã€‚\n"
+msgstr "è¦å¸è½½ %lu 个软件包,有 %lu 个软件包未被å‡çº§ã€‚\n"
#: cmdline/apt-get.cc:596
#, c-format
@@ -770,7 +765,7 @@ msgstr " 完æˆ"
#: cmdline/apt-get.cc:684
msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "您也许需è¦è¿è¡Œâ€œapt-get -f installâ€æ¥çº æ­£ä¸Šé¢çš„错误。"
+msgstr "您也许需è¦è¿è¡Œâ€œapt-get -f installâ€æ¥ä¿®æ­£ä¸Šé¢çš„错误。"
#: cmdline/apt-get.cc:687
msgid "Unmet dependencies. Try using -f."
@@ -778,7 +773,7 @@ msgstr "ä¸èƒ½æ»¡è¶³ä¾èµ–关系。ä¸å¦¨è¯•ä¸€ä¸‹ -f 选项。"
#: cmdline/apt-get.cc:712
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ã€è­¦å‘Šã€‘:下列的软件包ä¸èƒ½é€šè¿‡éªŒè¯ï¼"
+msgstr "ã€è­¦å‘Šã€‘:下列软件包ä¸èƒ½é€šè¿‡éªŒè¯ï¼"
#: cmdline/apt-get.cc:716
msgid "Authentication warning overridden.\n"
@@ -786,7 +781,7 @@ msgstr "忽略了认è¯è­¦å‘Šã€‚\n"
#: cmdline/apt-get.cc:723
msgid "Install these packages without verification [y/N]? "
-msgstr "ä¸ç»éªŒè¯å°±å®‰è£…这些软件包么?[y/N] "
+msgstr "ä¸ç»éªŒè¯å°±å®‰è£…这些软件包å—?[y/N] "
#: cmdline/apt-get.cc:725
msgid "Some packages could not be authenticated"
@@ -808,18 +803,18 @@ msgstr "有软件包需è¦è¢«å¸è½½ï¼Œä½†æ˜¯å¸è½½åŠ¨ä½œè¢«ç¨‹åºè®¾ç½®æ‰€ç¦æ­¢
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完æˆ"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
-msgstr "无法对下载目录加é”"
+msgstr "无法é”定下载目录"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
-msgstr "无法读å–安装æºåˆ—表。"
+msgstr "无法读å–æºåˆ—表。"
#: cmdline/apt-get.cc:836
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大å°ä¸ç¬¦ï¼Œå‘ä¿¡ç»™ apt@packages.debian.org å§"
+msgstr "怪了……文件大å°ä¸ç¬¦ï¼Œè¯·å‘ä¿¡ç»™ apt@packages.debian.org å§"
#: cmdline/apt-get.cc:841
#, c-format
@@ -841,24 +836,24 @@ msgstr "解压缩åŽä¼šæ¶ˆè€—掉 %sB çš„é¢å¤–空间。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩åŽå°†ä¼šç©ºå‡º %sB 的空间。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的空余空间"
+msgstr "无法获知您在 %s 上的å¯ç”¨ç©ºé—´"
#: cmdline/apt-get.cc:880
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "您在 %s 中没有足够的空余空间。"
+msgstr "您在 %s 上没有足够的å¯ç”¨ç©ºé—´ã€‚"
#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了 Trivial Only,但这ä¸æ˜¯ä¸ªæ—¥å¸¸(trivial)æ“作。"
+msgstr "虽然您指定了仅执行常规æ“作,但这ä¸æ˜¯ä¸ªå¸¸è§„æ“作。"
#: cmdline/apt-get.cc:898
msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
+msgstr "是,按我说的åšï¼"
#: cmdline/apt-get.cc:900
#, c-format
@@ -879,16 +874,16 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行å—?[Y/n]"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
#: cmdline/apt-get.cc:1011
msgid "Some files failed to download"
-msgstr "有一些文件下载失败"
+msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "下载完毕,目å‰æ˜¯â€œä»…下载â€æ¨¡å¼"
@@ -902,7 +897,7 @@ msgstr ""
#: cmdline/apt-get.cc:1022
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "ç›®å‰è¿˜ä¸æ”¯æŒ --fix-missing 和介质交æ¢(media swapping)"
+msgstr "ç›®å‰è¿˜ä¸æ”¯æŒ --fix-missing 和介质交æ¢"
#: cmdline/apt-get.cc:1027
msgid "Unable to correct missing packages."
@@ -910,7 +905,7 @@ msgstr "无法更正缺少的软件包。"
#: cmdline/apt-get.cc:1028
msgid "Aborting install."
-msgstr "放弃安装。"
+msgstr "中止安装。"
#: cmdline/apt-get.cc:1086
#, c-format
@@ -953,7 +948,7 @@ msgstr ""
#: cmdline/apt-get.cc:1167
msgid "However the following packages replace it:"
-msgstr "å¯æ˜¯ä¸‹åˆ—的软件包å–代了它:"
+msgstr "å¯æ˜¯ä¸‹åˆ—软件包å–代了它:"
#: cmdline/apt-get.cc:1170
#, c-format
@@ -986,53 +981,54 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
+#| msgid "Couldn't stat source package list %s"
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "无法获å–æºè½¯ä»¶åŒ…列表 %s 的状æ€"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
-msgstr " update 命令是ä¸éœ€ä»»ä½•å‚æ•°çš„"
+msgstr " update 命令ä¸éœ€è¦å‚æ•°"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "无法对状æ€åˆ—表目录加é”"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们ä¸åº”该进行删除,无法å¯åŠ¨è‡ªåŠ¨åˆ é™¤å™¨"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr "下列软件包是自动安装的并且现在ä¸å†è¢«ä½¿ç”¨äº†ï¼š"
+msgstr "下列软件包是自动安装的并且现在ä¸éœ€è¦äº†ï¼š"
-#: cmdline/apt-get.cc:1503
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1515
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "下列软件包是自动安装的并且现在ä¸å†è¢«ä½¿ç”¨äº†ï¼š"
+msgstr "%lu 个自动安装的的软件包现在ä¸éœ€è¦äº†\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用'apt-get autoremove'æ¥åˆ é™¤å®ƒä»¬"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动删除器æ¯æŽ‰äº†ä¸€äº›è½¯ä»¶ï¼Œè¿™ä¸åº”该å‘ç”Ÿã€‚è¯·å‘ apt æ交错误报告。"
+msgstr "似乎自动删除工具æŸå了一些软件,这ä¸åº”该å‘ç”Ÿã€‚è¯·å‘ apt æ交错误报告。"
#.
#. if (Packages == 1)
@@ -1044,43 +1040,43 @@ msgstr "似乎自动删除器æ¯æŽ‰äº†ä¸€äº›è½¯ä»¶ï¼Œè¿™ä¸åº”该å‘生。请å‘
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
-msgstr "下列的信æ¯å¯èƒ½ä¼šå¯¹è§£å†³é—®é¢˜æœ‰æ‰€å¸®åŠ©ï¼š"
+msgstr "下列信æ¯å¯èƒ½ä¼šå¯¹è§£å†³é—®é¢˜æœ‰æ‰€å¸®åŠ©ï¼š"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误,自动删除器å事了"
+msgstr "内部错误,自动删除工具å事了"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误,全部å‡çº§å事了"
+msgstr "内部错误,全部å‡çº§å·¥å…·å事了"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "无法找到任务 %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注æ„,根æ®æ­£åˆ™è¡¨è¾¾å¼â€œ%2$sâ€é€‰ä¸­äº† %1$s\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您å¯èƒ½éœ€è¦è¿è¡Œâ€œapt-get -f installâ€æ¥çº æ­£ä¸‹åˆ—错误:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1088,133 +1084,133 @@ msgstr ""
"有未能满足的ä¾èµ–关系。请å°è¯•ä¸æŒ‡æ˜Žè½¯ä»¶åŒ…çš„åå­—æ¥è¿è¡Œâ€œapt-get -f installâ€(也å¯"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"有一些软件包无法被安装。如果您用的是ä¸ç¨³å®š(unstable)å‘行版,这也许是\n"
+"有一些软件包无法被安装。如果您用的是 unstable å‘行版,这也许是\n"
"因为系统无法达到您è¦æ±‚的状æ€é€ æˆçš„。该版本中å¯èƒ½ä¼šæœ‰ä¸€äº›æ‚¨éœ€è¦çš„软件\n"
-"包尚未被创建或是它们还在新到(incoming)目录中。"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
-msgstr "无法安装的软件包"
+msgstr "ç ´æŸçš„软件包"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "将会安装下列é¢å¤–的软件包:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "推è安装的软件包:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
-msgstr "正在筹划å‡çº§... "
+msgstr "正在对å‡çº§è¿›è¡Œè®¡ç®—... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "完æˆ"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误,问题解决器å事了"
+msgstr "内部错误,问题解决工具å事了"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "è¦ä¸‹è½½æºä»£ç ï¼Œå¿…须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的æºä»£ç åŒ…"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%sâ€\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "您在 %s 上没有足够的空余空间"
+msgstr "您在 %s 上没有足够的å¯ç”¨ç©ºé—´"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需è¦ä¸‹è½½ %sB/%sB çš„æºä»£ç åŒ…。\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需è¦ä¸‹è½½ %sB çš„æºä»£ç åŒ…。\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "下载æºä»£ç  %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "对于已ç»è¢«è§£åŒ…到 %s 目录的æºä»£ç åŒ…å°±ä¸å†è§£å¼€äº†\n"
+msgstr "忽略已ç»è¢«è§£åŒ…到 %s 目录的æºä»£ç åŒ…\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "è¿è¡Œè§£åŒ…的命令“%sâ€å‡ºé”™ã€‚\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是å¦å®‰è£…了“dpkg-devâ€è½¯ä»¶åŒ…。\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%sâ€å¤±è´¥ã€‚\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "å­è¿›ç¨‹å‡ºé”™"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
-msgstr "è¦æ£€æŸ¥ç”Ÿæˆè½¯ä»¶åŒ…的构建ä¾èµ–关系(builddeps),必须指定至少一个软件包"
+msgstr "è¦æ£€æŸ¥ç”Ÿæˆè½¯ä»¶åŒ…的构建ä¾èµ–关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "无法获得 %s 的构建ä¾èµ–关系(build-dependency)ä¿¡æ¯"
+msgstr "无法获得 %s 的构建ä¾èµ–关系信æ¯"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建ä¾èµ–关系信æ¯ã€‚\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此ä¸èƒ½æ»¡è¶³ %2$s 所è¦æ±‚çš„ %1$s ä¾èµ–关系"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,31 +1219,30 @@ msgstr ""
"由于无法找到符åˆè¦æ±‚的软件包 %3$s çš„å¯ç”¨ç‰ˆæœ¬ï¼Œå› æ­¤ä¸èƒ½æ»¡è¶³ %2$s 所è¦æ±‚çš„ %1"
"$s ä¾èµ–关系"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所è¦æ±‚ %1$s ä¾èµ–关系:已安装的软件包 %3$s 太新了"
+msgstr "无法满足 %2$s 所è¦æ±‚ %1$s ä¾èµ–关系:已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所è¦æ±‚ %1$s ä¾èµ–关系:%3$s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ä¸èƒ½æ»¡è¶³è½¯ä»¶åŒ… %s 所è¦æ±‚的构建ä¾èµ–关系。"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "无法处ç†æž„建ä¾èµ–关系"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
-msgstr "被支æŒæ¨¡å—:"
+msgstr "支æŒçš„模å—:"
-#: cmdline/apt-get.cc:2699
-#, fuzzy
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,8 +1286,8 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
"用法: apt-get [选项] 命令\n"
-" apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-" apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"    apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"    apt-get [选项] source 软件包1 [软件包2 ...]\n"
"\n"
"apt-get æ供了一个用于下载和安装软件包的简易命令行界é¢ã€‚\n"
"最常用命令是 update 和 install。\n"
@@ -1319,8 +1314,8 @@ msgstr ""
" -d 仅仅下载 - ã€ä¸ã€‘安装或解开包文件\n"
" -s ä¸ä½œå®žé™…æ“作。åªæ˜¯ä¾æ¬¡æ¨¡æ‹Ÿæ‰§è¡Œå‘½ä»¤\n"
" -y 对所有询问都回答是(Yes),åŒæ—¶ä¸ä½œä»»ä½•æ示\n"
-" -f 当出现破æŸçš„ä¾èµ–关系时,程åºå°†è¯•å›¾ä¿®æ­£ç³»ç»Ÿ\n"
-" -m 当有包文件无法找到时,程åºä»è¯•å›¾ç»§ç»­æ‰§è¡Œ\n"
+" -f 当出现破æŸçš„ä¾èµ–关系时,程åºå°†å°è¯•ä¿®æ­£ç³»ç»Ÿ\n"
+" -m 当有包文件无法找到时,程åºä»å°è¯•ç»§ç»­æ‰§è¡Œ\n"
" -u 显示已å‡çº§çš„软件包列表\n"
" -b 在下载完æºç åŒ…åŽï¼Œç¼–译生æˆç›¸åº”的软件包\n"
" -V 显示详尽的版本å·\n"
@@ -1328,15 +1323,18 @@ msgstr ""
" -o=? 设置任æ„指定的é…置选项,例如 -o dir::cache=/tmp\n"
"请查阅 apt-get(8)ã€sources.list(5) å’Œ apt.conf(5)çš„å‚考手册\n"
"以获å–更多信æ¯å’Œé€‰é¡¹ã€‚\n"
-" 本 APT 有ç€è¶…级牛力。\n"
+" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"注æ„:这åªæ˜¯æ¨¡æ‹Ÿï¼\n"
+"   apt-get éœ€è¦ root 特æƒè¿›è¡Œå®žé™…的执行。\n"
+"   åŒæ—¶è¯·è®°ä½æ­¤æ—¶å¹¶æœªé”定,所以请勿完全相信当å‰çš„情况ï¼"
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1373,7 +1371,7 @@ msgid ""
msgstr ""
"æ›´æ¢ä»‹è´¨ï¼šè¯·æŠŠæ ‡æœ‰\n"
"“%sâ€\n"
-"的碟片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®\n"
+"的盘片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
@@ -1417,14 +1415,12 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "您想è¦åˆ é™¤ä¹‹å‰ä¸‹è½½çš„所有 .deb 文件å—?"
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "在解包时å‘生了一些错误。我正准备é…ç½®"
+msgstr "在解包时å‘生了一些错误。已ç»å®‰è£…的软件包"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "å·²ç»å®‰è£…的软件包。这个æ“作å¯èƒ½ä¼šå¯¼è‡´å‡ºçŽ°é‡å¤çš„错误"
+msgstr "将被é…置。这个æ“作å¯èƒ½ä¼šå¯¼è‡´å‡ºçŽ°é‡å¤çš„错误"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1437,7 +1433,7 @@ msgstr "这个æ示之å‰çš„错误消æ¯æ‰å€¼å¾—您注æ„。请更正它们,
#: dselect/update:30
msgid "Merging available information"
-msgstr "正在åˆå¹¶çŽ°æœ‰ä¿¡æ¯"
+msgstr "正在åˆå¹¶å¯ç”¨ä¿¡æ¯"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
@@ -1453,7 +1449,7 @@ msgstr "包文件已被æŸå"
#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
-msgstr "tar 的校验ç ä¸ç¬¦ï¼ŒåŒ…文件已被æŸå"
+msgstr "Tar 的校验和ä¸ç¬¦ï¼Œæ–‡ä»¶å·²æŸå"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
@@ -1462,28 +1458,28 @@ msgstr "未知的 TAR æ•°æ®å¤´ç±»åž‹ %u,æˆå‘˜ %s"
#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
-msgstr "无效的打包文件特å¾å·(signature)"
+msgstr "无效的归档签å"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "读å–打包文件中的æˆå‘˜æ–‡ä»¶å¤´å‡ºé”™"
+msgstr "读å–å½’æ¡£æˆå‘˜æ–‡ä»¶å¤´å‡ºé”™"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "打包文件中æˆå‘˜æ–‡ä»¶å¤´æ— æ•ˆ"
+msgstr "归档文件中æˆå‘˜æ–‡ä»¶å¤´ %s 无效"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
-msgstr "打包文件中æˆå‘˜æ–‡ä»¶å¤´æ— æ•ˆ"
+msgstr "归档文件中æˆå‘˜æ–‡ä»¶å¤´æ— æ•ˆ"
#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
-msgstr "存档太短了"
+msgstr "归档文件太短"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "无法读å–打包文件的数æ®å¤´"
+msgstr "无法读å–归档文件的数æ®å¤´"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
@@ -1491,11 +1487,11 @@ msgstr "把 DropNode 用在了ä»åœ¨é“¾è¡¨ä¸­çš„节点上"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "无法分é…散列表项ï¼"
+msgstr "无法定ä½å“ˆå¸Œè¡¨å…ƒç´ ï¼"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
-msgstr "无法分é…转移项(diversion)"
+msgstr "无法分é…转移项"
#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
@@ -1504,12 +1500,12 @@ msgstr "内部错误,出现在 AddDiversion"
#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "试图覆盖一个转移项(diversion),%s -> %s å³ %s/%s"
+msgstr "å°è¯•è¦†ç›–一个转移项,%s -> %s å’Œ %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项(diversion) %s-> %s"
+msgstr "添加了两个转移项 %s-> %s"
#: apt-inst/filelist.cc:549
#, c-format
@@ -1529,7 +1525,7 @@ msgstr "无法关闭文件 %s"
#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
msgid "The path %s is too long"
-msgstr "路径å %s 过长"
+msgstr "路径å %s 太长"
#: apt-inst/extract.cc:124
#, c-format
@@ -1539,16 +1535,16 @@ msgstr "%s 被解包了ä¸åªä¸€æ¬¡"
#: apt-inst/extract.cc:134
#, c-format
msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移(diverted)"
+msgstr "目录 %s 已被转移"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正å°è¯•å†™å…¥è½¬ç§»å¯¹è±¡(diversion target) %s/%s"
+msgstr "该软件包正å°è¯•å†™å…¥è½¬ç§»å¯¹è±¡ %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
-msgstr "该转移路径(diversion path)过长"
+msgstr "该转移路径太长"
#: apt-inst/extract.cc:240
#, c-format
@@ -1557,11 +1553,11 @@ msgstr "目录 %s è¦è¢«ä¸€ä¸ªéžç›®å½•çš„文件替æ¢"
#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶(hash bucket)中分é…节点"
+msgstr "无法在其散列桶中分é…节点"
#: apt-inst/extract.cc:284
msgid "The path is too long"
-msgstr "路径å过长"
+msgstr "路径å太长"
#: apt-inst/extract.cc:414
#, c-format
@@ -1578,7 +1574,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的åŒå文件"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1636,8 +1632,8 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"无法打开列表文件“%sinfo/%sâ€ã€‚如果您ä¸èƒ½æ¢å¤è¿™ä¸ªæ–‡ä»¶ï¼Œé‚£ä¹ˆå°±æ¸…空该文件,å†é©¬ä¸Š"
-"é‡æ–°å®‰è£…相åŒç‰ˆæœ¬çš„这个软件包ï¼"
+"无法打开列表文件“%sinfo/%sâ€ã€‚如果您ä¸èƒ½æ¢å¤è¿™ä¸ªæ–‡ä»¶ï¼Œé‚£ä¹ˆå°±æ¸…空该文件并马上é‡"
+"新安装相åŒç‰ˆæœ¬çš„这个软件包ï¼"
#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
@@ -1651,11 +1647,11 @@ msgstr "获得一个节点时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "无法打开转移é…置文件(diversions file) %sdiversions"
+msgstr "无法打开转移é…置文件 %sdiversions"
#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
-msgstr "该转移é…置文件(diversion file)被æŸå了"
+msgstr "该转移é…置文件被æŸå了"
#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
#: apt-inst/deb/dpkgdb.cc:337
@@ -1665,7 +1661,7 @@ msgstr "转移é…置文件中有一行是无效的:%s"
#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
-msgstr "添加 diversion 时出现内部错误"
+msgstr "添加转移é…置时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
@@ -1684,7 +1680,7 @@ msgstr "状æ€æ–‡ä»¶ä¸­æœ‰é”™è¯¯çš„ ConfFile 段。ä½äºŽå移ä½ç½® %lu"
#: apt-inst/deb/dpkgdb.cc:466
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "æ— æ³•è§£æž MD5 ç ã€‚文件内å移é‡ä¸º %lu"
+msgstr "è§£æž MD5 出错。文件内å移é‡ä¸º %lu"
#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
@@ -1707,7 +1703,7 @@ msgstr "内部错误,无法定ä½åŒ…内文件"
#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
-msgstr "无法在打包文件中找到有效的主控文件"
+msgstr "无法在归档文件中找到有效的主控文件"
#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
@@ -1716,19 +1712,19 @@ msgstr "ä¸èƒ½è§£æžçš„主控文件"
#: methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "无法读å–光盘数æ®åº“ %s"
+msgstr "无法读å–盘片数æ®åº“ %s"
#: methods/cdrom.cc:209
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"请使用 apt-cdrom,通过它就å¯ä»¥è®© APT 能识别该光盘。apt-get upgdate ä¸èƒ½è¢«ç”¨æ¥"
-"加入新的光盘。"
+"请使用 apt-cdrom,通过它就å¯ä»¥è®© APT 能识别该盘片。apt-get upgdate ä¸èƒ½è¢«ç”¨æ¥"
+"加入新的盘片。"
#: methods/cdrom.cc:219
msgid "Wrong CD-ROM"
-msgstr "错误的光盘"
+msgstr "错误的 CD-ROM"
#: methods/cdrom.cc:245
#, c-format
@@ -1737,18 +1733,18 @@ msgstr "无法å¸è½½çŽ°åœ¨æŒ‚载于 %s çš„ CD-ROM,它å¯èƒ½æ­£åœ¨ä½¿ç”¨ä¸­ã€‚"
#: methods/cdrom.cc:250
msgid "Disk not found."
-msgstr "找ä¸åˆ°å…‰ç›˜ã€‚"
+msgstr "找ä¸åˆ°ç›˜ç‰‡ã€‚"
#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "无法读å–状æ€"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1757,148 +1753,148 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "无效的 URI,本地的 URI ä¸èƒ½ä»¥ // 开头"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机å"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "无法获知本地主机å"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "æœåŠ¡å™¨æ‹’ç»äº†æˆ‘们的连接,它å“应é“:%s"
+msgstr "æœåŠ¡å™¨æ‹’ç»äº†æˆ‘们的连接,å“应信æ¯ä¸ºï¼š%s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER 指令出错,æœåŠ¡å™¨å“应é“:%s"
+msgstr "USER 指令出错,æœåŠ¡å™¨å“应信æ¯ä¸ºï¼š%s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错,æœåŠ¡å™¨å“应é“:%s"
+msgstr "PASS 指令出错,æœåŠ¡å™¨å“应信æ¯ä¸ºï¼š%s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"您指定了代ç†æœåŠ¡å™¨ï¼Œä½†æ˜¯æ²¡æœ‰ç™»é™†è„šæœ¬ï¼ŒAcquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%sâ€å‡ºé”™ï¼ŒæœåŠ¡å™¨å“应é“:%s"
+msgstr "登录脚本命令“%sâ€å‡ºé”™ï¼ŒæœåŠ¡å™¨å“应信æ¯ä¸ºï¼š%s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE 指令出错,æœåŠ¡å™¨å“应é“:%s"
+msgstr "TYPE 指令出错,æœåŠ¡å™¨å“应信æ¯ä¸ºï¼š%s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "æœåŠ¡å™¨å…³é—­äº†è¿žæŽ¥"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大å°ã€‚"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "å议有误"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
-msgstr "写文件出错"
+msgstr "写出错"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
-msgstr "ä¸èƒ½åˆ›å»ºå¥—接字"
+msgstr "无法创建套接字"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数æ®å¥—接字,连接超时"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "无法连接被动模å¼çš„套接字。"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到侦å¬å¥—接字"
+msgstr "getaddrinfo 无法得到监å¬å¥—接字"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
-msgstr "无法在套接字上侦å¬"
+msgstr "无法在套接字上监å¬"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的åå­—"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "无法å‘出 PORT 指令"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地å€æ— %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错,æœåŠ¡å™¨å“应é“:%s"
+msgstr "EPRT 指令出错,æœåŠ¡å™¨å“应信æ¯ä¸ºï¼š%s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "æ•°æ®å¥—接字连接超时"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "无法接å—连接"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "把文件加入散列表时出错"
+msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获å–文件,æœåŠ¡å™¨å“应é““%sâ€"
+msgstr "无法获å–文件,æœåŠ¡å™¨å“应信æ¯ä¸ºâ€œ%sâ€"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "æ•°æ®å¥—接字超时"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "æ•°æ®ä¼ é€å‡ºé”™ï¼ŒæœåŠ¡å™¨å“应é““%sâ€"
+msgstr "æ•°æ®ä¼ é€å‡ºé”™ï¼ŒæœåŠ¡å™¨å“应信æ¯ä¸ºâ€œ%sâ€"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -1951,27 +1947,28 @@ msgstr "æš‚æ—¶ä¸èƒ½è§£æžåŸŸå“%sâ€"
#: methods/connect.cc:193
#, fuzzy, c-format
+#| msgid "Something wicked happened resolving '%s:%s' (%i)"
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解æžâ€œ%s:%sâ€æ—¶ï¼Œå‡ºçŽ°äº†æŸäº›æ•…éšœ (%i)"
+msgstr "解æžâ€œ%s:%sâ€æ—¶ï¼Œå‡ºçŽ°äº†æŸäº›æ•…éšœ(%i)"
#: methods/connect.cc:240
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "ä¸èƒ½è¿žæŽ¥ä¸Š %s %s:"
+msgstr "ä¸èƒ½è¿žæŽ¥åˆ° %s:%s:"
#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
-msgstr "无法访问密匙:“%sâ€"
+msgstr "无法访问密钥环:“%sâ€"
#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "错误:Acquire::gpgv::Options çš„å‚数列表超长。结æŸè¿è¡Œã€‚"
+msgstr "错误:Acquire::gpgv::Options çš„å‚数列表太长。结æŸè¿è¡Œã€‚"
#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "内部错误:签å正确无误,但是无法确认密钥的指纹(key fingerprint)?ï¼"
+msgstr "内部错误:签å正确无误,但是无法确认密钥指纹?ï¼"
#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
@@ -1980,7 +1977,7 @@ msgstr "至少å‘现一个无效的签å。"
#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr "无法è¿è¡Œ\"%s\"以验è¯ç­¾å(您安装了 gpgv 么?)"
+msgstr "无法è¿è¡Œâ€œ%sâ€ä»¥éªŒè¯ç­¾å(您安装了 gpgv å—?)"
#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
@@ -1994,7 +1991,7 @@ msgstr "下列签å无效:\n"
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr "由于没有公钥,下列签å无法进行验è¯ï¼š\n"
+msgstr "由于没有公钥,无法验è¯ä¸‹åˆ—ç­¾å:\n"
#: methods/gzip.cc:64
#, c-format
@@ -2006,80 +2003,80 @@ msgstr "无法为 %s å¼€å¯ç®¡é“"
msgid "Read error from %s process"
msgstr "从 %s 进程读å–æ•°æ®å‡ºé”™"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "å—到了一行报头æ¡ç›®ï¼Œå®ƒçš„长度超过了 %u 个字符"
+msgstr "接收到一行报头行,它的长度超过了 %u 个字符"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
-msgstr "错误的报头æ¡ç›®"
+msgstr "错误的报头行"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
-msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„应答报头"
+msgstr "该 HTTP æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„应答报头"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Length 报头"
+msgstr "该 HTTP æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Length 报头"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Range 报头"
+msgstr "该 HTTP æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Range 报头"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
-msgstr "该 http æœåŠ¡å™¨çš„ range 支æŒä¸æ­£å¸¸"
+msgstr "该 HTTP æœåŠ¡å™¨çš„ range 支æŒä¸æ­£å¸¸"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "无法识别的日期格å¼"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
-msgstr "连接æœåŠ¡å™¨è¶…æ—¶"
+msgstr "连接超时"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®æ—¶å‡ºé”™ï¼Œå¯¹æ–¹å…³é—­äº†è¿žæŽ¥"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®å‡ºé”™"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
-msgstr "截断文件失败"
+msgstr "无法截断文件"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "错误的报头数æ®"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "内部错误"
@@ -2087,55 +2084,48 @@ msgstr "内部错误"
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数æ®"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"åŠ¨æ€ MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当å‰å€¼ï¼š%lu。(man 5 "
+"åŠ¨æ€ MMap 没有空间了。请增大 APT::Cache-Limit 的大å°ã€‚当å‰å€¼ï¼š%lu。(man 5 "
"apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%li天 %liå°æ—¶ %li分 %li秒"
#. h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:353
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%liå°æ—¶ %li分 %li秒"
#. min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:360
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%li分 %li秒"
#. s means seconds
#: apt-pkg/contrib/strutl.cc:365
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%li秒"
#: apt-pkg/contrib/strutl.cc:1040
#, c-format
msgid "Selection %s not found"
-msgstr "没有å‘现您的所选 %s"
+msgstr "找ä¸åˆ°æ‚¨é€‰åˆ™çš„ %s"
#: apt-pkg/contrib/configuration.cc:458
#, c-format
@@ -2190,7 +2180,7 @@ msgstr "语法错误 %s:%u: 文件尾部有多余的无æ„义的数æ®"
#: apt-pkg/contrib/progress.cc:153
#, c-format
msgid "%c%s... Error!"
-msgstr "%c%s... 有错误!"
+msgstr "%c%s... 有错误ï¼"
#: apt-pkg/contrib/progress.cc:155
#, c-format
@@ -2200,7 +2190,7 @@ msgstr "%c%s... 完æˆ"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%câ€[æ¥è‡ª %s]"
+msgstr "未知的命令行选项“%c†[æ¥è‡ª %s]"
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
@@ -2211,7 +2201,7 @@ msgstr "无法识别命令行选项 %s"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s ä¸æ˜¯ä¸ªå¸ƒå°”值"
+msgstr "命令行选项 %s ä¸æ˜¯å¸ƒå°”值"
#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
@@ -2231,7 +2221,7 @@ msgstr "选项 %s è¦æ±‚有一个整数作为å‚数,而ä¸æ˜¯â€œ%sâ€"
#: apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
-msgstr "选项“%sâ€è¶…é•¿"
+msgstr "选项“%sâ€å¤ªé•¿"
#: apt-pkg/contrib/cmndline.cc:298
#, c-format
@@ -2256,12 +2246,12 @@ msgstr "无法切æ¢å·¥ä½œç›®å½•åˆ° %s"
#: apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
-msgstr "无法读å–光盘的状æ€"
+msgstr "无法读å–盘片的状æ€"
#: apt-pkg/contrib/fileutl.cc:149
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "由于文件系统为åªè¯»ï¼Œå› è€Œæ— æ³•ä½¿ç”¨æ–‡ä»¶é”%s"
+msgstr "由于文件系统为åªè¯»ï¼Œå› è€Œæ— æ³•ä½¿ç”¨æ–‡ä»¶é” %s"
#: apt-pkg/contrib/fileutl.cc:154
#, c-format
@@ -2289,9 +2279,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "å­è¿›ç¨‹ %s å‘生了段错误"
#: apt-pkg/contrib/fileutl.cc:458
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "å­è¿›ç¨‹ %s å‘生了段错误"
+msgstr "å­è¿›ç¨‹ %s æ”¶åˆ°ä¿¡å· %u。"
#: apt-pkg/contrib/fileutl.cc:462
#, c-format
@@ -2301,7 +2291,7 @@ msgstr "å­è¿›ç¨‹ %s è¿”å›žäº†ä¸€ä¸ªé”™è¯¯å· (%u)"
#: apt-pkg/contrib/fileutl.cc:464
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "å­è¿›ç¨‹ %s 异常退出了"
+msgstr "å­è¿›ç¨‹ %s 异常退出"
#: apt-pkg/contrib/fileutl.cc:508
#, c-format
@@ -2311,24 +2301,24 @@ msgstr "无法打开文件 %s"
#: apt-pkg/contrib/fileutl.cc:564
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "读文件时出错,还剩 %lu 字节没有读出"
+msgstr "读å–文件出错,还剩 %lu 字节没有读出"
#: apt-pkg/contrib/fileutl.cc:594
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "写文件时出错,还剩 %lu 字节没有ä¿å­˜"
+msgstr "写入文件出错,还剩 %lu 字节没有ä¿å­˜"
#: apt-pkg/contrib/fileutl.cc:669
msgid "Problem closing the file"
-msgstr "关闭文件时出错"
+msgstr "关闭文件出错"
#: apt-pkg/contrib/fileutl.cc:675
msgid "Problem unlinking the file"
-msgstr "用 unlink 删除文件时出错"
+msgstr "用 unlink 删除文件出错"
#: apt-pkg/contrib/fileutl.cc:686
msgid "Problem syncing the file"
-msgstr "åŒæ­¥æ–‡ä»¶æ—¶å‡ºé”™"
+msgstr "åŒæ­¥æ–‡ä»¶å‡ºé”™"
#: apt-pkg/pkgcache.cc:133
msgid "Empty package cache"
@@ -2336,7 +2326,7 @@ msgstr "软件包缓存区是空的"
#: apt-pkg/pkgcache.cc:139
msgid "The package cache file is corrupted"
-msgstr "软件包缓存区文件æŸå了"
+msgstr "软件包缓存文件æŸå了"
#: apt-pkg/pkgcache.cc:144
msgid "The package cache file is an incompatible version"
@@ -2345,11 +2335,11 @@ msgstr "软件包缓存区文件的版本ä¸å…¼å®¹"
#: apt-pkg/pkgcache.cc:149
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "本程åºç›®å‰ä¸æ”¯æŒâ€œ%sâ€è¿™ä¸ªç‰ˆæœ¬æŽ§åˆ¶ç³»ç»Ÿ"
+msgstr "本程åºç›®å‰ä¸æ”¯æŒâ€œ%sâ€ç‰ˆæœ¬ç³»ç»Ÿ"
#: apt-pkg/pkgcache.cc:154
msgid "The package cache was built for a different architecture"
-msgstr "软件包缓存区是为其它架构的主机构造的"
+msgstr "软件包缓存区是为其它架构的硬件构建的"
#: apt-pkg/pkgcache.cc:225
msgid "Depends"
@@ -2385,7 +2375,7 @@ msgstr "ç ´å"
#: apt-pkg/pkgcache.cc:227
msgid "Enhances"
-msgstr ""
+msgstr "增强"
#: apt-pkg/pkgcache.cc:238
msgid "important"
@@ -2393,7 +2383,7 @@ msgstr "é‡è¦"
#: apt-pkg/pkgcache.cc:238
msgid "required"
-msgstr "å¿…è¦"
+msgstr "必需"
#: apt-pkg/pkgcache.cc:238
msgid "standard"
@@ -2446,27 +2436,27 @@ msgstr "无法解æžè½¯ä»¶åŒ…文件 %s (2)"
#: apt-pkg/sourcelist.cc:90
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行的格å¼æœ‰è¯¯ (URI)"
+msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行的格å¼æœ‰è¯¯(URI)"
#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (dist)"
+msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误(å‘行版)"
#: apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (URI parse)"
+msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误(URI 解æž)"
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (Ablolute dist)"
+msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误(独立å‘行版)"
#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (dist parse)"
+msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误(å‘行版解æž)"
#: apt-pkg/sourcelist.cc:206
#, c-format
@@ -2476,31 +2466,31 @@ msgstr "正在打开 %s"
#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
-msgstr "软件包æ¥æºæ¡£ %2$s 的第 %1$u 行超长了。"
+msgstr "æºåˆ—表 %2$s 的第 %1$u 行太长了。"
#: apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "在安装æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯ (type)"
+msgstr "在æºåˆ—表 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯(类型)"
#: apt-pkg/sourcelist.cc:247
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在安装æºåˆ—表 %3$s 里,第 %2$u 行中的软件包类别“%1$sâ€"
+msgstr "无法识别在æºåˆ—表 %3$s 里,第 %2$u 行中的软件包类别“%1$sâ€"
#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "在安装æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯ (vendor id)"
+msgstr "在æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯(供应商 ID)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2511,7 +2501,7 @@ msgstr ""
"少的软件包 %s。通常并ä¸å»ºè®®è¿™æ ·åšï¼Œä½†æ˜¯å¦‚果您确实希望如此,å¯ä»¥æ‰“å¼€ APT::"
"Force-LoopBreak 选项。"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2553,12 +2543,12 @@ msgstr ""
#: apt-pkg/acquire.cc:60
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial ä¸è§äº†ã€‚"
+msgstr "软件包列表的目录 %spartial 缺失。"
#: apt-pkg/acquire.cc:64
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "找ä¸åˆ°â€œ%spartialâ€è¿™ä¸ªç›®å½•ã€‚"
+msgstr "找ä¸åˆ°â€œ%spartialâ€ç›®å½•ã€‚"
#. only show the ETA if it makes sense
#. two days
@@ -2585,14 +2575,14 @@ msgstr "获å–è½¯ä»¶åŒ…çš„æ¸ é“ %s 所需的驱动程åºæ²¡æœ‰æ­£å¸¸å¯åŠ¨ã€‚"
#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有 “%s†的碟片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®ã€‚"
+msgstr "请把标有“%sâ€çš„盘片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®ã€‚"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ä¸æ”¯æŒâ€œ%sâ€æ‰“包系统"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适åˆçš„打包系统类型"
@@ -2603,7 +2593,7 @@ msgstr "æ— æ³•è¯»å– %s 的状æ€ã€‚"
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件包æºâ€çš„ URI"
+msgstr "您必须在您的 sources.list 写入一些“软件æºâ€çš„ URI"
#: apt-pkg/cachefile.cc:71
msgid "The package lists or status file could not be parsed or opened."
@@ -2614,14 +2604,14 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "您å¯èƒ½éœ€è¦è¿è¡Œ apt-get update æ¥è§£å†³è¿™äº›é—®é¢˜"
#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "å好设定(preferences)文件中å‘现有无效的记录,无 Package 字段头"
+msgstr "首选项文件 %s 中å‘现有无效的记录,无 Package 字段头"
#: apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
-msgstr "无法识别é”定的类型(pin type) %s"
+msgstr "无法识别é”定的类型 %s"
#: apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
@@ -2678,19 +2668,19 @@ msgstr "å¤„ç† %s (NewFileDesc2)时出错"
#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "糟了,软件包的数é‡äº†è¶…出本程åºçš„处ç†èƒ½åŠ›ã€‚"
+msgstr "哇,软件包数é‡è¶…出了本 APT 的处ç†èƒ½åŠ›ã€‚"
#: apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "糟了,软件包版本的数é‡äº†è¶…出本程åºçš„处ç†èƒ½åŠ›ã€‚"
+msgstr "哇,软件包版本数é‡è¶…出了本 APT 的处ç†èƒ½åŠ›ã€‚"
#: apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "糟了,软件包说明的数é‡äº†è¶…出本程åºçš„处ç†èƒ½åŠ›ã€‚"
+msgstr "哇,软件包说明数é‡è¶…出了本 APT 的处ç†èƒ½åŠ›ã€‚"
#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "糟了,ä¾èµ–关系的数é‡è¶…出了本程åºçš„处ç†èƒ½åŠ›ã€‚"
+msgstr "哇,ä¾èµ–关系数é‡è¶…出了本 APT 的处ç†èƒ½åŠ›ã€‚"
#: apt-pkg/pkgcachegen.cc:301
#, c-format
@@ -2718,26 +2708,26 @@ msgstr "正在收集文件所æ供的软件包"
#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
-msgstr "无法写入æ¥æºç¼“存文件"
+msgstr "无法读å–或写入软件æºç¼“å­˜"
#: apt-pkg/acquire-item.cc:128
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法é‡å‘½å文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5 校验和ä¸ç¬¦"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash 校验和ä¸ç¬¦"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 key ID 没有å¯ç”¨çš„公钥:\n"
+msgstr "以下 ID 的密钥没有å¯ç”¨çš„公钥:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2746,7 +2736,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这ç§æƒ…况下å¯èƒ½éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2754,30 +2744,30 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这ç§æƒ…况下您å¯èƒ½éœ€è¦æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶åŒ…。"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已æŸå。找ä¸åˆ°å¯¹åº”软件包 %s çš„ Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "大å°ä¸ç¬¦"
#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "无法解æžè½¯ä»¶åŒ…文件 %s (1)"
+msgstr "无法解æžè½¯ä»¶åŒ…仓库 Release 文件 %s"
#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "注æ„ï¼Œé€‰å– %s è€Œéž %s\n"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信æ¯"
#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "软件包仓库 Release 文件 %s 内无哈希æ¡ç›®"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2800,7 +2790,7 @@ msgstr "正在鉴别.. "
#: apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
-msgstr "已存档的标签:%s\n"
+msgstr "已归档文件的标签:%s\n"
#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
@@ -2826,7 +2816,7 @@ msgstr "正在挂载 CD-ROM 文件系统……\n"
#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
-msgstr "正在光盘中查找索引文件..\n"
+msgstr "正在盘片中查找索引文件..\n"
#: apt-pkg/cdrom.cc:673
#, c-format
@@ -2842,6 +2832,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"无法确定任何包文件的ä½ç½®ï¼Œå¯èƒ½è¿™ä¸æ˜¯ä¸€å¼  Debian 盘片或者是选择了错误的硬件构"
+"架。"
#: apt-pkg/cdrom.cc:710
#, c-format
@@ -2850,7 +2842,7 @@ msgstr "找到标签 '%s'\n"
#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
-msgstr "è¿™ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å字,请å†æ¬¡å‘½å。\n"
+msgstr "è¿™ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å字,请é‡è¯•ã€‚\n"
#: apt-pkg/cdrom.cc:755
#, c-format
@@ -2858,7 +2850,7 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"这张光盘现在的å字是:\n"
+"这张盘片现在的å字是:\n"
"“%sâ€\n"
#: apt-pkg/cdrom.cc:759
@@ -2867,11 +2859,11 @@ msgstr "正在å¤åˆ¶è½¯ä»¶åŒ…列表……"
#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
-msgstr "正在写入新的软件包æºåˆ—表\n"
+msgstr "正在写入新的æºåˆ—表\n"
#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
-msgstr "对应于该光盘的软件包æºè®¾ç½®é¡¹æ˜¯ï¼š\n"
+msgstr "对应于该盘片的软件æºè®¾ç½®é¡¹æ˜¯ï¼š\n"
#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
#, c-format
@@ -2886,128 +2878,141 @@ msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ‰ %i 个文件缺失。\n"
#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ‰ %i 个文件ä¸å»åˆ\n"
+msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ‰ %i 个文件ä¸åŒ¹é…\n"
#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ‰ %i ä¸ªç¼ºå¤±ï¼Œä»¥åŠ %i 个文件ä¸å»åˆ\n"
+msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ‰ %i ä¸ªç¼ºå¤±ï¼Œä»¥åŠ %i 个文件ä¸åŒ¹é…\n"
+
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "正在打开é…置文件 %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和ä¸ç¬¦"
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "正在é…ç½® %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "完全删除了 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装åŽæ‰§è¡Œçš„触å‘器 %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s ä¸è§äº†"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备é…ç½® %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除æ“作"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上?)\n"
+msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
-msgstr ""
+msgstr "正在è¿è¡Œ dpkg"
#: apt-pkg/deb/debsystem.cc:70
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
-msgstr ""
+msgstr "无法é”定管ç†ç›®å½•(%s),是å¦æœ‰å…¶ä»–进程正å ç”¨å®ƒï¼Ÿ"
#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状æ€åˆ—表目录加é”"
+msgstr "无法对状æ€åˆ—表目录加é”(%s),请查看您是å¦æ­£ä»¥ root 用户è¿è¡Œï¼Ÿ"
#: apt-pkg/deb/debsystem.cc:82
msgid ""
"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
"the problem. "
-msgstr ""
+msgstr "dpkg 被中断,您必须手工è¿è¡Œ 'dpkg --configure -a' 解决此问题。"
#: apt-pkg/deb/debsystem.cc:100
msgid "Not locked"
-msgstr ""
+msgstr "未é”定"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "无法打开补ä¸æ–‡ä»¶"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
-#~ msgid "Could not patch file"
-#~ msgstr "无法打开补ä¸æ–‡ä»¶"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "没有æºä»£ç åŒ…“%sâ€ï¼Œä½¿ç”¨â€œ%sâ€ä»£æ›¿\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
@@ -3027,7 +3032,7 @@ msgstr "连接被永久关闭"
#~ "您最好æ交一个针对这个软件包的故障报告。"
#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "第 %d 行超长了(长度é™åˆ¶ä¸º %lu)。"
+#~ msgstr "第 %d 行太长了(长度é™åˆ¶ä¸º %lu)。"
#~ msgid "After unpacking %sB of additional disk space will be used.\n"
#~ msgstr "解压缩åŽä¼šæ¶ˆè€—掉 %sB çš„é¢å¤–空间。\n"
@@ -3039,7 +3044,7 @@ msgstr "连接被永久关闭"
#~ msgstr "%s 已设置为手动安装。\n"
#~ msgid "Line %d too long (max %d)"
-#~ msgstr "第 %d 行超长了(长度é™åˆ¶ä¸º %d)"
+#~ msgstr "第 %d 行太长了(长度é™åˆ¶ä¸º %d)"
#~ msgid "Error occured while processing %s (NewFileDesc1)"
#~ msgstr "å¤„ç† %s (NewFileDesc1)时出错"
@@ -3048,7 +3053,7 @@ msgstr "连接被永久关闭"
#~ msgstr "å¤„ç† %s (NewFileDesc2)时出错"
#~ msgid "Stored label: %s \n"
-#~ msgstr "存档标签:%s \n"
+#~ msgstr "归档文件标签:%s \n"
#~ msgid ""
#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
@@ -3076,5 +3081,4 @@ msgstr "连接被永久关闭"
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
-#~ "在安装æºåˆ—表 %3$s 的第 %2$u è¡Œå‘现了无法识别的软件æ供商 ID (vendor ID) “%"
-#~ "1$sâ€"
+#~ "在æºåˆ—表 %3$s 的第 %2$u è¡Œå‘现了无法识别的软件æ供商 ID (vendor ID) “%1$sâ€"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6358c9789..2a5c87e59 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: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -146,14 +146,9 @@ msgstr " 套件鎖定:"
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
@@ -646,7 +641,7 @@ msgstr "無法將 %s æ›´å為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正è¦è¡¨ç¤ºå¼æ™‚發生錯誤 - %s"
@@ -807,11 +802,11 @@ msgstr "有套件需è¦è¢«ç§»é™¤ï¼Œä½†å»è¢«ç¦æ­¢ç§»é™¤ã€‚"
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤,排åºæœªèƒ½å®Œæˆ"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "無法讀å–來æºåˆ—表。"
@@ -840,8 +835,8 @@ msgstr "æ­¤æ“作完æˆä¹‹å¾Œï¼Œæœƒå¤šä½”用 %sB çš„ç£ç¢Ÿç©ºé–“。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "æ­¤æ“作完æˆä¹‹å¾Œï¼Œæœƒç©ºå‡º %sB çš„ç£ç¢Ÿç©ºé–“。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ç„¡æ³•ç¢ºèª %s 的未使用空間"
@@ -878,7 +873,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "是å¦ç¹¼çºŒé€²è¡Œ [Y/n]?"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法å–å¾— %s,%s\n"
@@ -887,7 +882,7 @@ msgstr "無法å–å¾— %s,%s\n"
msgid "Some files failed to download"
msgstr "有部份檔案無法下載"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr "下載完æˆï¼Œä¸”這是『僅下載ã€æ¨¡å¼"
@@ -984,49 +979,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr "é¸å®šçš„版本為 %3$s çš„ %1$s (%2$s)\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "無法å–得來æºå¥—件列表 %s 的狀態"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr "update 指令ä¸éœ€ä»»ä½•åƒæ•¸"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我們沒有計劃è¦åˆªé™¤ä»»ä½•æ±è¥¿ï¼Œç„¡æ³•å•Ÿå‹• AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "以下套件是被自動安è£é€²ä¾†çš„,且已ä¸å†æœƒè¢«ç”¨åˆ°äº†ï¼š"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, fuzzy, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr "以下套件是被自動安è£é€²ä¾†çš„,且已ä¸å†æœƒè¢«ç”¨åˆ°äº†ï¼š"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用 'apt-get autoremove' 來將其移除。"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1044,43 +1039,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr "以下的資訊或許有助於解決當å‰çš„情æ³ï¼š"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr "內部錯誤,AutoRemover 處ç†å¤±æ•—"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造æˆäº†æ壞"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr "無法找到主題 %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注æ„,根據正è¦è¡¨ç¤ºå¼ '%2$s' 而é¸æ“‡äº† %1$s\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安è£ã€‚\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您也許得執行 `apt-get -f install' 以修正這些å•é¡Œï¼š"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1088,7 +1083,7 @@ msgstr ""
"未能滿足相ä¾é—œä¿‚。請試著ä¸æŒ‡å®šå¥—件來執行 'apt-get -f install'(或採å–其它的解"
"決方案)。"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1098,122 +1093,122 @@ msgstr ""
"有些套件無法安è£ã€‚這å¯èƒ½æ„謂著您的è¦æ±‚難以解決,或是若您使用的是\n"
"unstable 發行版,å¯èƒ½æœ‰äº›å¿…è¦çš„套件尚未建立,或是被移出 Incoming 了。"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr "æ毀的套件"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr "下列的é¡å¤–套件將被安è£ï¼š"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr "建議套件:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr "推薦套件:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr "籌備å‡ç´šä¸­... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr "完æˆ"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,å•é¡ŒæŽ’除器造æˆäº†æ壞"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr "在å–得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "ç•¥éŽå·²ä¸‹è¼‰çš„檔案 '%s'\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr "在 %s 裡沒有足夠的的未使用空間"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需è¦ä¸‹è¼‰ %sB/%sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需è¦ä¸‹è¼‰ %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr "å–得原始碼 %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr "無法å–å¾—æŸäº›å¥—件檔。"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "ä¸è§£é–‹ï¼Œå› åŽŸå§‹ç¢¼å·²è§£é–‹è‡³ %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是å¦å·²å®‰è£äº† 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr "å­ç¨‹åºå¤±æ•—"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相ä¾é—œä¿‚時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法å–å¾— %s 的編譯相ä¾é—œä¿‚資訊"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相ä¾é—œä¿‚。\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所è¦æ±‚çš„ %1$s 相ä¾é—œä¿‚,因為找ä¸åˆ°å¥—件 %3$s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,30 +1216,30 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所è¦æ±‚çš„ %1$s 相ä¾é—œä¿‚,因為套件 %3$s 沒有版本符åˆå…¶ç‰ˆæœ¬éœ€æ±‚"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 的相ä¾é—œä¿‚ %1$s:已安è£çš„套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相ä¾é—œä¿‚ %1$s:%3$s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相ä¾é—œä¿‚。"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr "無法處ç†ç·¨è­¯ç›¸ä¾é—œä¿‚"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr "已支æ´æ¨¡çµ„:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1328,7 +1323,7 @@ msgstr ""
"以å–得更多資訊和é¸é …。\n"
" 該 APT 有著超級牛力。\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1575,7 +1570,7 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相åŒæª”案"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1740,11 +1735,11 @@ msgid "File not found"
msgstr "找ä¸åˆ°æª”案"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "無法å–得狀態"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -1753,148 +1748,148 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "ä¸æ­£ç¢ºçš„ URI,本機 URI ä¸æ‡‰ä»¥ // é–‹é ­"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "登入中"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "無法解æžå°æ–¹ä¸»æ©Ÿå稱"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "無法解æžæœ¬æ©Ÿå稱"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "伺æœå™¨ä¸æŽ¥å—連線,並回應:%s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令失敗,伺æœå™¨å›žæ‡‰ï¼š%s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令失敗,伺æœå™¨å›žæ‡‰ï¼š%s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"指定了代ç†ä¼ºæœå™¨ï¼Œä½†æ²’有指定登入 script,Acquire::ftp::ProxyLogin 是空的。"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登入 script 指令 '%s' 失敗,伺æœå™¨å›žæ‡‰ï¼š%s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令失敗,伺æœå™¨å›žæ‡‰ï¼š%s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "連線逾時"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "伺æœå™¨å·²é—œé–‰é€£ç·š"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "讀å–錯誤"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "回應超éŽç·©è¡å€é•·åº¦ã€‚"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "å”定失敗"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "寫入錯誤"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "無法建立 Socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "無法和 data socket 連線,連線逾時"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "無法和 passive socket 連線。"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 無法å–å¾—ç›£è½ socket"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "無法 bind 至 socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "ç„¡æ³•ç›£è½ socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "ç„¡æ³•è§£æž socket å稱"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "無法é€å‡º PORT 指令"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "未知的地å€å®¶æ— %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令失敗,伺æœå™¨å›žæ‡‰ï¼š%s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Data socket 連線逾時"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "無法接å—連線"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "有å•é¡Œçš„雜湊檔"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "無法å–得檔案,伺æœå™¨å›žæ‡‰ '%s'"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Data socket 連線逾時"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "資料傳輸失敗,伺æœå™¨å›žæ‡‰ '%s'"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "查詢"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "無法 invoke "
@@ -2002,80 +1997,80 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "ç”± %s 程åºè®€å–錯誤"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "å–å¾—ä¸€å€‹å–®è¡Œè¶…éŽ %u 字元的標頭"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "標頭行錯誤"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆçš„回覆標頭"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆçš„ Content-Length 標頭"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 伺æœå™¨å‚³é€äº†ä¸€å€‹ç„¡æ•ˆçš„ Content-Range 標頭"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "這個 HTTP 伺æœå™¨çš„範åœæ”¯æ´æœ‰å•é¡Œ"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "未知的資料格å¼"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "é¸æ“‡å¤±æ•—"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "在寫入輸出檔時發生錯誤"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "在寫入檔案時發生錯誤"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "在寫入該檔時發生錯誤"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "在讀å–伺æœå™¨æ™‚發生錯誤,é ç«¯ä¸»æ©Ÿå·²é—œé–‰é€£ç·š"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "在讀å–伺æœå™¨æ™‚發生錯誤"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "無法截短檔案"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "錯誤的標頭資料"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "內部錯誤"
@@ -2083,12 +2078,12 @@ msgstr "內部錯誤"
msgid "Can't mmap an empty file"
msgstr "ä¸èƒ½ mmap 空白檔案"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法 mmap 到 %lu ä½å…ƒçµ„"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2097,13 +2092,6 @@ msgstr ""
"å‹•æ…‹ MMap 已用完所有空間。請增加 APT::Cache-Limit 的大å°ã€‚ç›®å‰å¤§å°ç‚ºï¼š%lu。"
"(man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2489,14 +2477,14 @@ msgstr "未知的類型 '%1$s',ä½æ–¼åœ¨ä¾†æºåˆ—表 %3$s 中的第 %2$u è¡Œ"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "來æºåˆ—表 %2$s 中的第 %1$u 行的格å¼éŒ¯èª¤ï¼ˆæ供者 ID)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2506,7 +2494,7 @@ msgstr ""
"此安è£å› è¡çªæˆ–é å…ˆç›¸ä¾é—œä¿‚,需暫時刪除 %s 這個基本套件。這通常ä¸æ˜¯å¥½ä¸»æ„,但"
"若您執æ„進行,請設定 APT::Force-LoopBreak é¸é …。"
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2579,12 +2567,12 @@ msgstr "安è£æ–¹å¼ %s 沒有正確啟動"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "請把標籤為 '%s' 的光碟放入 '%s' è£ç½®ä¸­ï¼Œç„¶å¾ŒæŒ‰ä¸‹ [Enter] éµã€‚"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ä¸æ”¯æ´çš„套件包è£ç³»çµ± '%s'"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "無法確èªåˆé©çš„套件包è£ç³»çµ±é¡žåž‹"
@@ -2717,19 +2705,19 @@ msgstr "在儲存來æºå¿«å–時 IO 錯誤"
msgid "rename failed, %s (%s -> %s)."
msgstr "無法é‡æ–°å‘½å,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5Sum ä¸ç¬¦"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash Sum ä¸ç¬¦"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法å–得以下的密鑰 ID 的公鑰:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2738,20 +2726,20 @@ msgstr ""
"找ä¸åˆ° %s 套件的æŸå€‹æª”案。這æ„味著您å¯èƒ½è¦æ‰‹å‹•ä¿®å¾©é€™å€‹å¥—件。(因為找ä¸åˆ°å¹³"
"å°ï¼‰"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找ä¸åˆ° %s 套件的æŸå€‹æª”案。這æ„味著您å¯èƒ½è¦æ‰‹å‹•ä¿®å¾©é€™å€‹å¥—件。"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔æ壞了。沒有套件 %s çš„ Filename: 欄ä½ã€‚"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "大å°ä¸ç¬¦"
@@ -2882,76 +2870,99 @@ msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案ä¸ç¬¦\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案éºå¤±äº†ï¼Œæœ‰ %i 個檔案ä¸ç¬¦\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "開啟設定檔 %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+#| msgid "Hash Sum mismatch"
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum ä¸ç¬¦"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "æ­£åœ¨å®‰è£ %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "正在設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "正在移除 %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+msgid "Completely removing %s"
+msgstr "已完整移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "正在執行安è£å¾Œå¥—件後續處ç†ç¨‹å¼ %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "找ä¸åˆ° '%s' 目錄"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "正在準備 %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "正在解開 %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "正在準備設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "å·²å®‰è£ %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在準備移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "已移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在準備完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "無法寫入記錄檔,openpty() 失敗(/dev/pts 未掛載?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909
msgid "Running dpkg"
msgstr ""
@@ -2977,26 +2988,16 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "無法修補檔案"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "連線çªç„¶çµ‚æ­¢"
-#~ msgid "Could not patch file"
-#~ msgstr "無法修補檔案"
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
deleted file mode 100644
index da1aa5e97..000000000
--- a/share/debian-archive.gpg
+++ /dev/null
Binary files differ
diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg
deleted file mode 100644
index 2ce60d454..000000000
--- a/share/ubuntu-archive.gpg
+++ /dev/null
Binary files differ
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc
new file mode 100644
index 000000000..ed8d2dad6
--- /dev/null
+++ b/test/libapt/getlistoffilesindir_test.cc
@@ -0,0 +1,82 @@
+#include <apt-pkg/fileutl.h>
+
+#include "assert.h"
+#include <string>
+#include <vector>
+
+#include <stdio.h>
+#include <iostream>
+
+// simple helper to quickly output a vector of strings
+void dumpVector(std::vector<std::string> vec) {
+ for (std::vector<std::string>::const_iterator v = vec.begin();
+ v != vec.end(); v++)
+ std::cout << *v << std::endl;
+}
+
+#define P(x) string(argv[1]).append("/").append(x)
+
+int main(int argc,char *argv[])
+{
+ if (argc != 2) {
+ std::cout << "One parameter expected - given " << argc << std::endl;
+ return 100;
+ }
+
+ // Files with no extension
+ std::vector<std::string> files = GetListOfFilesInDir(argv[1], "", true);
+ equals(files.size(), 2);
+ equals(files[0], P("01yet-anothernormalfile"));
+ equals(files[1], P("anormalfile"));
+
+ // Files with no extension - should be the same as above
+ files = GetListOfFilesInDir(argv[1], "", true, true);
+ equals(files.size(), 2);
+ equals(files[0], P("01yet-anothernormalfile"));
+ equals(files[1], P("anormalfile"));
+
+ // Files with impossible extension
+ files = GetListOfFilesInDir(argv[1], "impossible", true);
+ equals(files.size(), 0);
+
+ // Files with impossible or no extension
+ files = GetListOfFilesInDir(argv[1], "impossible", true, true);
+ equals(files.size(), 2);
+ equals(files[0], P("01yet-anothernormalfile"));
+ equals(files[1], P("anormalfile"));
+
+ // Files with list extension - nothing more
+ files = GetListOfFilesInDir(argv[1], "list", true);
+ equals(files.size(), 4);
+ equals(files[0], P("01yet-anotherapt.list"));
+ equals(files[1], P("anormalapt.list"));
+ equals(files[2], P("linkedfile.list"));
+ equals(files[3], P("multi.dot.list"));
+
+ // Files with conf or no extension
+ files = GetListOfFilesInDir(argv[1], "conf", true, true);
+ equals(files.size(), 5);
+ equals(files[0], P("01yet-anotherapt.conf"));
+ equals(files[1], P("01yet-anothernormalfile"));
+ equals(files[2], P("anormalapt.conf"));
+ equals(files[3], P("anormalfile"));
+ equals(files[4], P("multi.dot.conf"));
+
+ // Files with disabled extension - nothing more
+ files = GetListOfFilesInDir(argv[1], "disabled", true);
+ equals(files.size(), 3);
+ equals(files[0], P("disabledfile.conf.disabled"));
+ equals(files[1], P("disabledfile.disabled"));
+ equals(files[2], P("disabledfile.list.disabled"));
+
+ // Files with disabled or no extension
+ files = GetListOfFilesInDir(argv[1], "disabled", true, true);
+ equals(files.size(), 5);
+ equals(files[0], P("01yet-anothernormalfile"));
+ equals(files[1], P("anormalfile"));
+ equals(files[2], P("disabledfile.conf.disabled"));
+ equals(files[3], P("disabledfile.disabled"));
+ equals(files[4], P("disabledfile.list.disabled"));
+
+ return 0;
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 5712c025a..08f581e6d 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -17,3 +17,9 @@ PROGRAM = ParseDepends${BASENAME}
SLIBS = -lapt-pkg
SOURCE = parsedepends_test.cc
include $(PROGRAM_H)
+
+# Program for testing GetListOfFilesInDir
+PROGRAM = GetListOfFilesInDir${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = getlistoffilesindir_test.cc
+include $(PROGRAM_H)
diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh
index 365bbe215..1fcfb6861 100755
--- a/test/libapt/run-tests.sh
+++ b/test/libapt/run-tests.sh
@@ -1,10 +1,52 @@
#!/bin/sh
+set -e
+
echo "Compiling the tests ..."
make
echo "Running all testcases ..."
-PATH=$(pwd)/../../build/bin
-for testapp in $(/bin/ls ${PATH}/*_libapt_test)
+LDPATH=$(pwd)/../../build/bin
+EXT="_libapt_test"
+for testapp in $(ls ${LDPATH}/*$EXT)
do
- echo -n "Testing with \033[1;35m$(/usr/bin/basename ${testapp})\033[0m ... "
- LD_LIBRARY_PATH=${PATH} ${testapp} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m"
+ name=$(basename ${testapp})
+ tmppath=""
+
+ if [ $name = "GetListOfFilesInDir${EXT}" ]; then
+ # TODO: very-low: move env creation to the actual test-app
+ echo "Prepare Testarea for \033[1;35m$name\033[0m ..."
+ tmppath=$(mktemp -d)
+ touch "${tmppath}/anormalfile" \
+ "${tmppath}/01yet-anothernormalfile" \
+ "${tmppath}/anormalapt.conf" \
+ "${tmppath}/01yet-anotherapt.conf" \
+ "${tmppath}/anormalapt.list" \
+ "${tmppath}/01yet-anotherapt.list" \
+ "${tmppath}/wrongextension.wron" \
+ "${tmppath}/wrong-extension.wron" \
+ "${tmppath}/strangefile." \
+ "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \
+ "${tmppath}/.hiddenfile" \
+ "${tmppath}/.hiddenfile.conf" \
+ "${tmppath}/.hiddenfile.list" \
+ "${tmppath}/multi..dot" \
+ "${tmppath}/multi.dot.conf" \
+ "${tmppath}/multi.dot.list" \
+ "${tmppath}/disabledfile.disabled" \
+ "${tmppath}/disabledfile.conf.disabled" \
+ "${tmppath}/disabledfile.list.disabled" \
+ "${tmppath}/invälid.conf" \
+ "${tmppath}/invalíd" \
+ "${tmppath}/01invalíd"
+ ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list"
+ ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list"
+ fi
+
+ echo -n "Testing with \033[1;35m${name}\033[0m ... "
+ LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m"
+
+ if [ -n "$tmppath" -a -d "$tmppath" ]; then
+ echo "Cleanup Testarea after \033[1;35m$name\033[0m ..."
+ rm -rf "$tmppath"
+ fi
+
done
diff --git a/test/versiontest.cc b/test/versiontest.cc
index 5438eb4de..4ede4b280 100644
--- a/test/versiontest.cc
+++ b/test/versiontest.cc
@@ -14,7 +14,7 @@
##################################################################### */
/*}}}*/
-#include <system.h>
+#include <apt-pkg/macros.h>
#include <apt-pkg/error.h>
#include <apt-pkg/version.h>
#include <apt-pkg/debversion.h>