summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire-item.cc176
-rw-r--r--apt-pkg/acquire-item.h100
-rw-r--r--apt-pkg/contrib/fileutl.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.cc28
-rw-r--r--apt-pkg/sourcelist.cc119
-rw-r--r--apt-pkg/sourcelist.h10
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog55
-rwxr-xr-xdebian/rules1
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot144
-rw-r--r--doc/po/de.po193
-rw-r--r--doc/po/es.po193
-rw-r--r--doc/po/fr.po193
-rw-r--r--doc/po/it.po193
-rw-r--r--doc/po/ja.po193
-rw-r--r--doc/po/pl.po193
-rw-r--r--doc/po/pt.po193
-rw-r--r--doc/po/pt_BR.po154
-rw-r--r--doc/sources.list.5.xml53
-rw-r--r--methods/rred.cc1201
-rw-r--r--po/ar.po169
-rw-r--r--po/ast.po187
-rw-r--r--po/bg.po187
-rw-r--r--po/bs.po169
-rw-r--r--po/ca.po187
-rw-r--r--po/cs.po187
-rw-r--r--po/cy.po169
-rw-r--r--po/da.po188
-rw-r--r--po/de.po188
-rw-r--r--po/dz.po169
-rw-r--r--po/el.po169
-rw-r--r--po/es.po187
-rw-r--r--po/eu.po169
-rw-r--r--po/fi.po169
-rw-r--r--po/fr.po188
-rw-r--r--po/gl.po187
-rw-r--r--po/hu.po187
-rw-r--r--po/it.po187
-rw-r--r--po/ja.po187
-rw-r--r--po/km.po169
-rw-r--r--po/ko.po187
-rw-r--r--po/ku.po169
-rw-r--r--po/lt.po169
-rw-r--r--po/mr.po169
-rw-r--r--po/nb.po187
-rw-r--r--po/ne.po169
-rw-r--r--po/nl.po187
-rw-r--r--po/nn.po169
-rw-r--r--po/pl.po187
-rw-r--r--po/pt.po187
-rw-r--r--po/pt_BR.po169
-rw-r--r--po/ro.po169
-rw-r--r--po/ru.po187
-rw-r--r--po/sk.po187
-rw-r--r--po/sl.po187
-rw-r--r--po/sv.po187
-rw-r--r--po/th.po182
-rw-r--r--po/tl.po169
-rw-r--r--po/tr.po187
-rw-r--r--po/uk.po187
-rw-r--r--po/vi.po187
-rw-r--r--po/zh_CN.po179
-rw-r--r--po/zh_TW.po169
-rw-r--r--test/integration/framework11
-rwxr-xr-xtest/integration/test-apt-progress-fd-conffile17
-rwxr-xr-xtest/integration/test-apt-sources-deb82287
-rwxr-xr-xtest/integration/test-bug-728500-tempdir19
-rwxr-xr-xtest/integration/test-pdiff-usage156
-rw-r--r--test/libapt/makefile6
-rw-r--r--test/libapt/sourcelist_test.cc53
71 files changed, 6494 insertions, 4978 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index b76921312..1185908f3 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -369,10 +369,10 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
return;
}
- if(Debug)
- std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): "
- << CurrentPackagesFile << std::endl;
-
+ if(Debug)
+ std::clog << "pkgAcqDiffIndex::pkgAcqDiffIndex(): "
+ << CurrentPackagesFile << std::endl;
+
QueueURI(Desc);
}
@@ -398,8 +398,8 @@ string pkgAcqDiffIndex::Custom600Headers()
bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
{
if(Debug)
- std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile
- << std::endl;
+ std::clog << "pkgAcqDiffIndex::ParseIndexDiff() " << IndexDiffFile
+ << std::endl;
pkgTagSection Tags;
string ServerSha1;
@@ -426,16 +426,18 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
SHA1.AddFD(fd);
string const local_sha1 = SHA1.Result();
- if(local_sha1 == ServerSha1)
+ if(local_sha1 == ServerSha1)
{
- // we have the same sha1 as the server
+ // we have the same sha1 as the server so we are done here
if(Debug)
std::clog << "Package file is up-to-date" << std::endl;
- // set found to true, this will queue a pkgAcqIndexDiffs with
- // a empty availabe_patches
- found = true;
- }
- else
+ // list cleanup needs to know that this file as well as the already
+ // present index is ours, so we create an empty diff to save it for us
+ new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
+ ExpectedHash, ServerSha1, available_patches);
+ return true;
+ }
+ else
{
if(Debug)
std::clog << "SHA1-Current: " << ServerSha1 << " and we start at "<< fd.Name() << " " << fd.Size() << " " << local_sha1 << std::endl;
@@ -460,7 +462,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
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", 20);
+ unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0);
if (fileLimit != 0 && fileLimit < available_patches.size())
{
if (Debug)
@@ -496,14 +498,37 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
}
// we have something, queue the next diff
- if(found)
+ if(found)
{
// queue the diffs
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,
- ExpectedHash, ServerSha1, available_patches);
+
+ /* decide if we should download patches one by one or in one go:
+ The first is good if the server merges patches, but many don't so client
+ based merging can be attempt in which case the second is better.
+ "bad things" will happen if patches are merged on the server,
+ but client side merging is attempt as well */
+ bool pdiff_merge = _config->FindB("Acquire::PDiffs::Merge", true);
+ if (pdiff_merge == true)
+ {
+ // reprepro adds this flag if it has merged patches on the server
+ std::string const precedence = Tags.FindS("X-Patch-Precedence");
+ pdiff_merge = (precedence != "merged");
+ }
+
+ if (pdiff_merge == false)
+ new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
+ ExpectedHash, ServerSha1, available_patches);
+ else
+ {
+ std::vector<pkgAcqIndexMergeDiffs*> *diffs = new std::vector<pkgAcqIndexMergeDiffs*>(available_patches.size());
+ for(size_t i = 0; i < available_patches.size(); ++i)
+ (*diffs)[i] = new pkgAcqIndexMergeDiffs(Owner, RealURI, Description, Desc.ShortDesc, ExpectedHash,
+ available_patches[i], diffs);
+ }
+
Complete = false;
Status = StatDone;
Dequeue();
@@ -752,6 +777,123 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has
}
}
/*}}}*/
+// AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor /*{{{*/
+pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
+ string const &URI, string const &URIDesc,
+ string const &ShortDesc, HashString const &ExpectedHash,
+ DiffInfo const &patch,
+ std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
+ : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash),
+ patch(patch),allPatches(allPatches), State(StateFetchDiff)
+{
+
+ DestFile = _config->FindDir("Dir::State::lists") + "partial/";
+ DestFile += URItoFileName(URI);
+
+ Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
+
+ Description = URIDesc;
+ Desc.Owner = this;
+ Desc.ShortDesc = ShortDesc;
+
+ Desc.URI = string(RealURI) + ".diff/" + patch.file + ".gz";
+ Desc.Description = Description + " " + patch.file + string(".pdiff");
+ DestFile = _config->FindDir("Dir::State::lists") + "partial/";
+ DestFile += URItoFileName(RealURI + ".diff/" + patch.file);
+
+ if(Debug)
+ std::clog << "pkgAcqIndexMergeDiffs: " << Desc.URI << std::endl;
+
+ QueueURI(Desc);
+}
+ /*}}}*/
+void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
+{
+ if(Debug)
+ std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl;
+ Complete = false;
+ Status = StatDone;
+ Dequeue();
+
+ // check if we are the first to fail, otherwise we are done here
+ State = StateDoneDiff;
+ for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
+ I != allPatches->end(); ++I)
+ if ((*I)->State == StateErrorDiff)
+ return;
+
+ // first failure means we should fallback
+ State = StateErrorDiff;
+ std::clog << "Falling back to normal index file aquire" << std::endl;
+ new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc,
+ ExpectedHash);
+}
+ /*}}}*/
+void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string Md5Hash, /*{{{*/
+ pkgAcquire::MethodConfig *Cnf)
+{
+ if(Debug)
+ std::clog << "pkgAcqIndexMergeDiffs::Done(): " << Desc.URI << std::endl;
+
+ Item::Done(Message,Size,Md5Hash,Cnf);
+
+ string const FinalFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
+
+ if (State == StateFetchDiff)
+ {
+ // rred expects the patch as $FinalFile.ed.$patchname.gz
+ Rename(DestFile, FinalFile + ".ed." + patch.file + ".gz");
+
+ // check if this is the last completed diff
+ State = StateDoneDiff;
+ for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
+ I != allPatches->end(); ++I)
+ if ((*I)->State != StateDoneDiff)
+ {
+ if(Debug)
+ std::clog << "Not the last done diff in the batch: " << Desc.URI << std::endl;
+ return;
+ }
+
+ // this is the last completed diff, so we are ready to apply now
+ State = StateApplyDiff;
+
+ if(Debug)
+ std::clog << "Sending to rred method: " << FinalFile << std::endl;
+
+ Local = true;
+ Desc.URI = "rred:" + FinalFile;
+ QueueURI(Desc);
+ Mode = "rred";
+ return;
+ }
+ // success in download/apply all diffs, clean up
+ else if (State == StateApplyDiff)
+ {
+ // see if we really got the expected file
+ if(!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile))
+ {
+ RenameOnError(HashSumMismatch);
+ return;
+ }
+
+ // move the result into place
+ if(Debug)
+ std::clog << "Moving patched file in place: " << std::endl
+ << DestFile << " -> " << FinalFile << std::endl;
+ Rename(DestFile, FinalFile);
+ chmod(FinalFile.c_str(), 0644);
+
+ // otherwise lists cleanup will eat the file
+ DestFile = FinalFile;
+
+ // all set and done
+ Complete = true;
+ if(Debug)
+ std::clog << "allDone: " << DestFile << "\n" << std::endl;
+ }
+}
+ /*}}}*/
// AcqIndex::AcqIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* The package file is added to the queue and a second class is
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 6b4f73708..5a1c7979c 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -429,7 +429,105 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
std::string ShortDesc, HashString ExpectedHash);
};
/*}}}*/
-/** \brief An item that is responsible for fetching all the patches {{{
+/** \brief An item that is responsible for fetching client-merge patches {{{
+ * that need to be applied to a given package index file.
+ *
+ * Instead of downloading and applying each patch one by one like its
+ * sister #pkgAcqIndexDiffs this class will download all patches at once
+ * and call rred with all the patches downloaded once. Rred will then
+ * merge and apply them in one go, which should be a lot faster – but is
+ * incompatible with server-based merges of patches like reprepro can do.
+ *
+ * \sa pkgAcqDiffIndex, pkgAcqIndex
+ */
+class pkgAcqIndexMergeDiffs : public pkgAcquire::Item
+{
+ protected:
+
+ /** \brief If \b true, debugging output will be written to
+ * std::clog.
+ */
+ bool Debug;
+
+ /** \brief description of the item that is currently being
+ * downloaded.
+ */
+ pkgAcquire::ItemDesc Desc;
+
+ /** \brief URI of the package index file that is being
+ * reconstructed.
+ */
+ std::string RealURI;
+
+ /** \brief HashSum of the package index file that is being
+ * reconstructed.
+ */
+ HashString ExpectedHash;
+
+ /** \brief description of the file being downloaded. */
+ std::string Description;
+
+ /** \brief information about the current patch */
+ struct DiffInfo const patch;
+
+ /** \brief list of all download items for the patches */
+ std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches;
+
+ /** The current status of this patch. */
+ enum DiffState
+ {
+ /** \brief The diff is currently being fetched. */
+ StateFetchDiff,
+
+ /** \brief The diff is currently being applied. */
+ StateApplyDiff,
+
+ /** \brief the work with this diff is done */
+ StateDoneDiff,
+
+ /** \brief something bad happened and fallback was triggered */
+ StateErrorDiff
+ } State;
+
+ public:
+ /** \brief Called when the patch file failed to be downloaded.
+ *
+ * This method will fall back to downloading the whole index file
+ * outright; its arguments are ignored.
+ */
+ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+
+ virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
+ pkgAcquire::MethodConfig *Cnf);
+ virtual std::string DescURI() {return RealURI + "Index";};
+
+ /** \brief Create an index merge-diff item.
+ *
+ * \param Owner The pkgAcquire object that owns this item.
+ *
+ * \param URI The URI of the package index file being
+ * reconstructed.
+ *
+ * \param URIDesc A long description of this item.
+ *
+ * \param ShortDesc A brief description of this item.
+ *
+ * \param ExpectedHash The expected md5sum of the completely
+ * reconstructed package index file; the index file will be tested
+ * against this value when it is entirely reconstructed.
+ *
+ * \param patch contains infos about the patch this item is supposed
+ * to download which were read from the index
+ *
+ * \param allPatches contains all related items so that each item can
+ * check if it was the last one to complete the download step
+ */
+ pkgAcqIndexMergeDiffs(pkgAcquire *Owner,std::string const &URI,std::string const &URIDesc,
+ std::string const &ShortDesc, HashString const &ExpectedHash,
+ DiffInfo const &patch, std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);
+};
+ /*}}}*/
+/** \brief An item that is responsible for fetching server-merge patches {{{
* that need to be applied to a given package index file.
*
* After downloading and applying a single patch, this item will
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index efbf7aaf4..ffb8b4b53 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -465,7 +465,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
const char *C = Ent->d_name;
for (; *C != 0; ++C)
if (isalpha(*C) == 0 && isdigit(*C) == 0
- && *C != '_' && *C != '-') {
+ && *C != '_' && *C != '-' && *C != ':') {
// no required extension -> dot is a bad character
if (*C == '.' && Ext.empty() == false)
continue;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 14ce133cf..506ebf620 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1028,6 +1028,12 @@ bool pkgDPkgPM::Go(int StatusFd)
void pkgDPkgPM::StartPtyMagic()
{
+ if (_config->FindB("Dpkg::Use-Pty", true) == false)
+ {
+ d->master = d->slave = -1;
+ return;
+ }
+
// setup the pty and stuff
struct winsize win;
@@ -1036,10 +1042,9 @@ void pkgDPkgPM::StartPtyMagic()
_error->PushToStack();
if (tcgetattr(STDOUT_FILENO, &d->tt) == 0)
{
- ioctl(1, TIOCGWINSZ, (char *)&win);
- if (_config->FindB("Dpkg::Use-Pty", true) == false)
+ if (ioctl(1, TIOCGWINSZ, (char *)&win) < 0)
{
- d->master = d->slave = -1;
+ _error->Errno("ioctl", _("ioctl(TIOCGWINSZ) failed"));
} else if (openpty(&d->master, &d->slave, NULL, &d->tt, &win) < 0)
{
_error->Errno("openpty", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
@@ -1393,12 +1398,17 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress)
if(d->slave >= 0 && d->master >= 0)
{
setsid();
- ioctl(d->slave, TIOCSCTTY, 0);
- close(d->master);
- dup2(d->slave, 0);
- dup2(d->slave, 1);
- dup2(d->slave, 2);
- close(d->slave);
+ int res = ioctl(d->slave, TIOCSCTTY, 0);
+ if (res < 0) {
+ std::cerr << "ioctl(TIOCSCTTY) failed for fd: "
+ << d->slave << std::endl;
+ } else {
+ close(d->master);
+ dup2(d->slave, 0);
+ dup2(d->slave, 1);
+ dup2(d->slave, 2);
+ close(d->slave);
+ }
}
close(fd[0]); // close the read end of the pipe
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 0fd237cad..4e580ba04 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -17,6 +17,7 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/metaindex.h>
#include <apt-pkg/indexfile.h>
+#include <apt-pkg/tagfile.h>
#include <fstream>
@@ -70,6 +71,53 @@ bool pkgSourceList::Type::FixupURI(string &URI) const
return true;
}
/*}}}*/
+bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
+ pkgTagSection &Tags,
+ int i,
+ FileFd &Fd)
+{
+ map<string, string> Options;
+
+ string URI = Tags.FindS("URI");
+ if (!FixupURI(URI))
+ {
+ _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
+ return false;
+ }
+
+ // Define external/internal options
+ const char* option_deb822[] = {
+ "Architectures", "Architectures-Add", "Architectures-Remove", "Trusted",
+ };
+ const char* option_internal[] = {
+ "arch", "arch+", "arch-", "trusted",
+ };
+ for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++)
+ if (Tags.Exists(option_deb822[j]))
+ Options[option_internal[j]] = Tags.FindS(option_deb822[j]);
+
+ // now create one item per suite/section
+ string Suite = Tags.FindS("Suites");
+ Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture"));
+ string const Section = Tags.FindS("Sections");
+
+ std::vector<std::string> list_dist = StringSplit(Suite, " ");
+ std::vector<std::string> list_section = StringSplit(Section, " ");
+ for (std::vector<std::string>::const_iterator I = list_dist.begin();
+ I != list_dist.end(); I++)
+ {
+ for (std::vector<std::string>::const_iterator J = list_section.begin();
+ J != list_section.end(); J++)
+ {
+ if (CreateItem(List, URI, (*I), (*J), Options) == false)
+ {
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
// Type::ParseLine - Parse a single line /*{{{*/
// ---------------------------------------------------------------------
/* This is a generic one that is the 'usual' format for sources.list
@@ -159,7 +207,6 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
return true;
}
/*}}}*/
-
// SourceList::pkgSourceList - Constructors /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -181,7 +228,6 @@ pkgSourceList::~pkgSourceList()
delete *I;
}
/*}}}*/
- /*}}}*/
// SourceList::ReadMainList - Read the main source list from etc /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -216,7 +262,6 @@ bool pkgSourceList::ReadMainList()
return Res;
}
/*}}}*/
-// CNC:2003-03-03 - Needed to preserve backwards compatibility.
// SourceList::Reset - Clear the sourcelist contents /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -227,7 +272,6 @@ void pkgSourceList::Reset()
SrcList.erase(SrcList.begin(),SrcList.end());
}
/*}}}*/
-// CNC:2003-03-03 - Function moved to ReadAppend() and Reset().
// SourceList::Read - Parse the sourcelist file /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -242,16 +286,28 @@ bool pkgSourceList::Read(string File)
/* */
bool pkgSourceList::ReadAppend(string File)
{
+ if (_config->FindB("APT::Sources::Use-Deb822", true) == true)
+ {
+ int lines_parsed =ParseFileDeb822(File);
+ if (lines_parsed < 0)
+ return false;
+ else if (lines_parsed > 0)
+ return true;
+ // no lines parsed ... fall through and use old style parser
+ }
+ return ParseFileOldStyle(File);
+}
+
+// SourceList::ReadFileOldStyle - Read Traditional style sources.list /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgSourceList::ParseFileOldStyle(string File)
+{
// Open the stream for reading
ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
if (!F != 0)
return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
-
-#if 0 // Now Reset() does this.
- for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++)
- delete *I;
- SrcList.erase(SrcList.begin(),SrcList.end());
-#endif
+
// CNC:2003-12-10 - 300 is too short.
char Buffer[1024];
@@ -298,6 +354,49 @@ bool pkgSourceList::ReadAppend(string File)
return true;
}
/*}}}*/
+// SourceList::ParseFileDeb822 - Parse deb822 style sources.list /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns: the number of stanzas parsed*/
+int pkgSourceList::ParseFileDeb822(string File)
+{
+ pkgTagSection Tags;
+ unsigned int i=0;
+
+ // see if we can read the file
+ _error->PushToStack();
+ FileFd Fd(File, FileFd::ReadOnly);
+ pkgTagFile Sources(&Fd);
+ if (_error->PendingError() == true)
+ {
+ _error->RevertToStack();
+ return 0;
+ }
+ _error->MergeWithStack();
+
+ // read step by step
+ while (Sources.Step(Tags) == true)
+ {
+ if(!Tags.Exists("Type"))
+ continue;
+
+ string const type = Tags.FindS("Type");
+ Type *Parse = Type::GetType(type.c_str());
+ if (Parse == 0)
+ {
+ _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str());
+ return -1;
+ }
+
+ if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
+ return -1;
+
+ i++;
+ }
+
+ // we are done, return the number of stanzas read
+ return i;
+}
+ /*}}}*/
// SourceList::FindIndex - Get the index associated with a file /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 02e27101a..0ccb4aa00 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -31,6 +31,7 @@
#include <vector>
#include <map>
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/tagfile.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/metaindex.h>
@@ -60,6 +61,10 @@ class pkgSourceList
const char *Label;
bool FixupURI(std::string &URI) const;
+ virtual bool ParseStanza(std::vector<metaIndex *> &List,
+ pkgTagSection &Tags,
+ int stanza_n,
+ FileFd &Fd);
virtual bool ParseLine(std::vector<metaIndex *> &List,
const char *Buffer,
unsigned long const &CurLine,std::string const &File) const;
@@ -75,7 +80,10 @@ class pkgSourceList
protected:
std::vector<metaIndex *> SrcList;
-
+
+ int ParseFileDeb822(std::string File);
+ bool ParseFileOldStyle(std::string File);
+
public:
bool ReadMainList();
diff --git a/configure.ac b/configure.ac
index 42c5d73df..8c6810511 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
PACKAGE="apt"
-PACKAGE_VERSION="0.9.14.2"
+PACKAGE_VERSION="0.9.14.3~exp3"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index fb8c5714f..b140cd7cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,58 @@
+apt (0.9.14.3~exp3) experimental; urgency=low
+
+ * implement deb822 suggestions by donkult (thanks!):
+ - rename "Dist" to "Suites"
+ - rename "Section" to "Sections"
+ - rename "Architectures-Delete" to "Architectures-Remove"
+ - rename "Uri" to "URI"
+ * add "apt list --manual-installed"
+ * add "apt upgrade --dist"
+ * add "apt purge"
+ * flock() the file edited in "apt edit-sources"
+ * apt-private/private-show.cc:
+ - do not show Description-lang: header
+ * reword apt !isatty() warning
+ * add missing integration test for "apt list" and fix bugs
+ found by it
+
+ -- Michael Vogt <mvo@debian.org> Sat, 18 Jan 2014 21:09:24 +0100
+
+apt (0.9.14.3~exp2) experimental; urgency=medium
+
+ [ Julian Andres Klode ]
+ * debian/rules: Call dh_makeshlibs for 'apt'
+
+ [ Anthony Towns ]
+ * reimplement rred to allow applying all the diffs in a single pass
+ * correct IndexDiff vs DiffIndex in Debug output
+
+ [ David Kalnischkies ]
+ * reenable unlimited pdiff files download
+ * integrate Anthonys rred with POC for client-side merge
+
+ [ Michael Vogt ]
+ * document deb822 style sources.list in sources.list(5)
+ * rename "Dist:" in deb822 style sources.list to "Suite:"
+ * rename URL to Uri in deb822-sources
+ * support multiple "Suite:" entries in deb822 style sources.list:
+ "Suite: stable testing unstable"
+
+ -- Michael Vogt <mvo@debian.org> Thu, 16 Jan 2014 21:43:22 +0100
+
+apt (0.9.14.3~exp1) experimental; urgency=low
+
+ [ Michael Vogt ]
+ * add support for "deb822" style sources.list format and add
+ APT::Sources::Use-Deb822 to support disabling it
+
+ [ David Kalnischkies ]
+ * implement POC client-side merging of pdiffs via apt-file
+
+ [ Trần Ngọc Quân ]
+ * l10n: vi.po(617t): Update Vietnamese translation
+
+ -- Michael Vogt <mvo@debian.org> Sun, 05 Jan 2014 15:13:32 +0100
+
apt (0.9.14.2) unstable; urgency=low
[ Joe Hansen ]
diff --git a/debian/rules b/debian/rules
index f4f7ec06b..3aa86480e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,6 +217,7 @@ apt: build-binary build-manpages debian/apt.install
dh_strip -p$@
dh_compress -p$@
dh_fixperms -p$@
+ dh_makeshlibs -p$@
dh_installdeb -p$@
dh_shlibdeps -p$@
dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)"
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 9a061e61d..47763c4c1 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.2">
+<!ENTITY apt-product-version "0.9.14.3~exp3">
<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 554206e01..039e07a24 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.14.2\n"
+"Project-Id-Version: apt-doc 0.9.14.3~exp3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -1132,7 +1132,7 @@ msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
+#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
msgid "See Also"
msgstr ""
@@ -3624,7 +3624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234 apt-ftparchive.1.xml:598
msgid "Examples"
msgstr ""
@@ -4695,35 +4695,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
+#: sources.list.5.xml:82
#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:100
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:109
msgid ""
-"<literal>distribution</literal> may also contain a variable, "
+"<literal>suite</literal> may also contain a variable, "
"<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
"<literal>amd64</literal> or <literal>armel</literal>) used on the "
"system. This permits architecture-independent "
@@ -4733,22 +4758,23 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
+#: sources.list.5.xml:117
msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -4759,7 +4785,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
"can be used to specify for which architectures information should be "
@@ -4768,7 +4794,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
"and "
@@ -4778,7 +4804,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the "
@@ -4790,7 +4816,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -4799,12 +4825,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -4814,17 +4840,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -4832,7 +4858,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -4840,7 +4866,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -4851,7 +4877,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -4864,7 +4890,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -4873,7 +4899,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -4882,12 +4908,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme "
@@ -4899,42 +4925,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -4942,7 +4968,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -4950,33 +4976,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -4985,19 +5011,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -5009,7 +5035,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 8983abb64..dad4c3f33 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1572,7 +1572,7 @@ msgstr "Dateien"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5210,7 +5210,7 @@ msgstr ""
"filename> gelesenen Anbieter aus."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Beispiele"
@@ -6697,7 +6697,7 @@ msgstr ""
"benötigt, um Quellindizes herunterzuladen."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6706,21 +6706,57 @@ msgstr ""
"<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-"
@@ -6734,15 +6770,24 @@ msgstr ""
"angegeben sein."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> könnte außerdem eine Variable, <literal>"
"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie "
@@ -6754,18 +6799,32 @@ msgstr ""
"Architektur generieren."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"Da pro Zeile nur eine Distribution angegeben werden kann, könnte es nötig "
"sein, mehrere Zeilen für die gleiche URI zu haben, falls eine Untermenge "
@@ -6781,7 +6840,7 @@ msgstr ""
"niedriger Bandbreite hauszuhalten."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6799,7 +6858,7 @@ msgstr ""
"stillschweigend ignoriert werden."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6815,7 +6874,7 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6837,7 +6896,7 @@ msgstr ""
"heruntergeladen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6855,7 +6914,7 @@ msgstr ""
"korrekt authentifizierte Quellen als nicht authentifiziert."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6869,12 +6928,12 @@ msgstr ""
"Rechnern, zum Beispiel)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "Einige Beispiele:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6886,17 +6945,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "URI-Beschreibung"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "Die derzeit zulässigen URI-Typen sind:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6907,7 +6966,7 @@ msgstr ""
"lokale Spiegel oder Archive."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6917,7 +6976,7 @@ msgstr ""
"der Quellenliste zu erstellen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6934,7 +6993,7 @@ msgstr ""
"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6956,7 +7015,7 @@ msgstr ""
"benutzen, werden ignoriert."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6969,7 +7028,7 @@ msgstr ""
"Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6983,12 +7042,12 @@ msgstr ""
"<command>find</command> und <command>dd</command> verwandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "weitere zulässige URI-Typen hinzufügen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7007,7 +7066,7 @@ msgstr ""
"Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7016,37 +7075,37 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
"benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7057,7 +7116,7 @@ msgstr ""
"<literal>amd64</literal> und <literal>armel</literal> holt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7067,7 +7126,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7076,13 +7135,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7092,13 +7151,13 @@ msgstr ""
"benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -7112,19 +7171,19 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7144,7 +7203,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/es.po b/doc/po/es.po
index c26c9476b..9debc5967 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1648,7 +1648,7 @@ msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5240,7 +5240,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Ejemplos"
@@ -6721,7 +6721,7 @@ msgstr ""
"literal> para obtener los índices de fuentes."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6730,21 +6730,57 @@ msgstr ""
"usando los tipos <literal>deb</literal> y <literal>deb-src</literal> es:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"El URI para el tipo <literal>deb</literal> debe especificar la base de la "
@@ -6757,15 +6793,24 @@ msgstr ""
"<literal>distribución</literal> no define una ruta exacta."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribución</literal> puede contener una variable, <literal>"
"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el "
@@ -6777,18 +6822,32 @@ msgstr ""
"sistema."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"Debido a que sólo se puede especificar una distribución por línea, es "
"posible que se precisen varias líneas para la misma URI si desea tener "
@@ -6803,7 +6862,7 @@ msgstr ""
"aprovechar mejor el ancho de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6820,7 +6879,7 @@ msgstr ""
"ignoran silenciosamente):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6835,7 +6894,7 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6856,7 +6915,7 @@ msgstr ""
"arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6874,7 +6933,7 @@ msgstr ""
"autenticadas no lo están."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6887,12 +6946,12 @@ msgstr ""
"seguidos por servidores de Internet distantes, por ejemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "Algunos ejemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6904,17 +6963,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "Especificación del URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "Los tipos de URI permitidos actualmente son:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6925,7 +6984,7 @@ msgstr ""
"particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6935,7 +6994,7 @@ msgstr ""
"list»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6953,7 +7012,7 @@ msgstr ""
"autenticación no es seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6974,7 +7033,7 @@ msgstr ""
"fichero de configuración."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6987,7 +7046,7 @@ msgstr ""
"permite realizar la copia de ficheros con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7001,12 +7060,12 @@ msgstr ""
"transferencia de ficheros desde la máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "Añadir más tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7025,7 +7084,7 @@ msgstr ""
"debtorrent, consulte &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7034,36 +7093,36 @@ msgstr ""
"para «stable/main», «stable/contrib», y «stable/non-free»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "Línea para obtener el código fuente desde la ubicación anterior."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7074,7 +7133,7 @@ msgstr ""
"obtiene <literal>amd64</literal> y <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7084,7 +7143,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7093,13 +7152,13 @@ msgstr ""
"usa sólo la sección «hamm/main»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7108,13 +7167,13 @@ msgstr ""
"del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -7127,19 +7186,19 @@ msgstr ""
"filename>, se usará sólo una sesión FTP para ambas."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7158,7 +7217,7 @@ msgstr ""
"tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 67a26a280..de8e83d68 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1567,7 +1567,7 @@ msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5196,7 +5196,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Exemples"
@@ -6666,7 +6666,7 @@ msgstr ""
"pour récupérer les index des sources."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6675,21 +6675,57 @@ msgstr ""
"types <literal>deb</literal> et <literal>deb-src</literal> est :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"L'URI de type <literal>deb</literal> doit indiquer la base de la "
@@ -6703,15 +6739,24 @@ msgstr ""
"être présent."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> peut aussi contenir une variable <literal>"
"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme "
@@ -6722,18 +6767,32 @@ msgstr ""
"literal> crée automatiquement un URI en fonction de l'architecture effective."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être "
"nécessaire de disposer le même URI sur plusieurs lignes quand on veut "
@@ -6748,7 +6807,7 @@ msgstr ""
"tirer plus efficacement parti des sites à faible bande passante."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6765,7 +6824,7 @@ msgstr ""
"ignorés silencieusement) :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6780,7 +6839,7 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6801,7 +6860,7 @@ msgstr ""
"Architectures</literal> sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6819,7 +6878,7 @@ msgstr ""
"authentifiées comme non authentifiées."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6832,12 +6891,12 @@ msgstr ""
"les hôtes distants."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "Exemples :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6849,17 +6908,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "Spécification des URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "Les types d'URI actuellement reconnues sont :"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6870,7 +6929,7 @@ msgstr ""
"avec les montages NFS, les miroirs et les archives locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6880,7 +6939,7 @@ msgstr ""
"pour créer des entrées dans la liste des sources."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6897,7 +6956,7 @@ msgstr ""
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6919,7 +6978,7 @@ msgstr ""
"configuration seront ignorés."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6933,7 +6992,7 @@ msgstr ""
"des fichiers avec APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6947,12 +7006,12 @@ msgstr ""
"sont utilisées pour l'accès aux fichiers de la machine distante."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "ajout de types d'URI supplémentaires reconnues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6971,7 +7030,7 @@ msgstr ""
"disponibles (voir &apt-transport-debtorrent;)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6980,37 +7039,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7021,7 +7080,7 @@ msgstr ""
"<literal>amd64</literal> et <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7031,7 +7090,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7040,13 +7099,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7055,13 +7114,13 @@ msgstr ""
"répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -7074,19 +7133,19 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7106,7 +7165,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/it.po b/doc/po/it.po
index 13818f98d..042abbc0b 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1611,7 +1611,7 @@ msgstr "File"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5215,7 +5215,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Esempi"
@@ -6703,7 +6703,7 @@ msgstr ""
"riga <literal>deb-src</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6712,21 +6712,57 @@ msgstr ""
"<literal>deb</literal> o <literal>deb-src</literal> è:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opzioni ] uri distribuzione [componente1] [componente2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"L'URI per il tipo <literal>deb</literal> deve specificare la base della "
@@ -6740,15 +6776,24 @@ msgstr ""
"<literal>componente</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribuzione</literal> può anche contenere una variabile <literal>"
"$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
@@ -6759,18 +6804,32 @@ msgstr ""
"automaticamente un URI con l'architettura corrente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"Dato che può essere specificata solo una distribuzione per riga, può essere "
"necessario avere più righe per lo stesso URI, se si desidera un sottoinsieme "
@@ -6786,7 +6845,7 @@ msgstr ""
"larghezza di banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6803,7 +6862,7 @@ msgstr ""
"supportate verranno ignorate in modo silenzioso):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6818,7 +6877,7 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6839,7 +6898,7 @@ msgstr ""
"Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6856,7 +6915,7 @@ msgstr ""
"tratta anche le fonti correttamente autenticate come non autenticate."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6869,12 +6928,12 @@ msgstr ""
"in una rete locale, seguiti da host Internet distanti)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "Alcuni esempi:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6886,17 +6945,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "Specificare URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "I tipi di URI attualmente riconosciuti sono:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6907,7 +6966,7 @@ msgstr ""
"archivi locali."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6917,7 +6976,7 @@ msgstr ""
"delle fonti."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6934,7 +6993,7 @@ msgstr ""
"è un metodo di autenticazione non sicuro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6954,7 +7013,7 @@ msgstr ""
"HTTP specificati nel file di configurazione verranno ignorati."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6967,7 +7026,7 @@ msgstr ""
"rimovibili, per copiare i file nelle varie posizioni con APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6981,12 +7040,12 @@ msgstr ""
"command> e <command>dd</command>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "aggiungere ulteriori tipi di URI riconoscibili"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -7005,7 +7064,7 @@ msgstr ""
"debtorrrent; vedere &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -7014,37 +7073,37 @@ msgstr ""
"debian per stable/main, stable/contrib e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/gianni/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Come sopra, tranne per il fatto che usa la distribuzione unstable (di "
"sviluppo)"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "Riga per i sorgenti corrispondente alla precedente"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7055,7 +7114,7 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7065,7 +7124,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7074,13 +7133,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7089,13 +7148,13 @@ msgstr ""
"e usa solo l'area &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -7108,19 +7167,19 @@ msgstr ""
"usata una sola sessione FTP per entrambe le righe."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7139,7 +7198,7 @@ msgstr ""
"modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index d73f29523..f877f2935 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1559,7 +1559,7 @@ msgstr "ファイル"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -4978,7 +4978,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "サンプル"
@@ -6412,7 +6412,7 @@ msgstr ""
"です。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6422,21 +6422,57 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コンポーネント2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
@@ -6449,15 +6485,24 @@ msgstr ""
"とつは <literal>component</literal> を指定しなければなりません。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
@@ -6468,18 +6513,32 @@ msgstr ""
"チャで URI を自動的に生成します。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 "
"distribution しか指定できないため、同じ URI の行を複数記述することになるで"
@@ -6491,7 +6550,7 @@ msgstr ""
"るホストへは、接続を並行して行うようにもしています。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6507,7 +6566,7 @@ msgstr ""
"す)。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6521,7 +6580,7 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6541,7 +6600,7 @@ msgstr ""
"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6558,7 +6617,7 @@ msgstr ""
"認証として扱います。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6571,12 +6630,12 @@ msgstr ""
"しょう。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "例:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6588,17 +6647,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "URI の仕様"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "現在認識できる URI タイプは以下のとおりです。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6608,7 +6667,7 @@ msgstr ""
"にします。これは NFS マウントやローカルミラーで便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6618,7 +6677,7 @@ msgstr ""
"グラムを使用してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6634,7 +6693,7 @@ msgstr ""
"指定してください。この認証方法は安全ではないことに注意してください。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6653,7 +6712,7 @@ msgstr ""
"す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6665,7 +6724,7 @@ msgstr ""
"用していて、APT でコピーを行う場合に便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6679,12 +6738,12 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "さらに認識できる URI タイプの追加"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6702,7 +6761,7 @@ msgstr ""
"transport-debtorrent; を参照してください。"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6711,35 +6770,35 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "上記のソース行は以下のようになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6750,7 +6809,7 @@ msgstr ""
"<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6760,7 +6819,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6769,13 +6828,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6784,13 +6843,13 @@ msgstr ""
"&stable-codename;/contrib のみを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -6803,19 +6862,19 @@ msgstr ""
"つだけになります。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6834,7 +6893,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4b0f8d89c..5d66ac29c 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1642,7 +1642,7 @@ msgstr "Pliki"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -4644,7 +4644,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Przykłady"
@@ -6118,7 +6118,7 @@ msgstr ""
"źródłowych."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6127,21 +6127,57 @@ msgstr ""
"<literal>deb</literal> i <literal>deb-src</literal> jest następujący:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"URI typu <literal>deb</literal> musi podawać bazową lokalizację dystrybucji "
@@ -6154,15 +6190,24 @@ msgstr ""
"<literal>komponent</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</"
"literal>, która zostanie rozwinięta do architektury Debiana (takiej jak "
@@ -6174,18 +6219,32 @@ msgstr ""
#
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"Ponieważ w pojedynczej linii można podać tylko jedną dystrybucję, może być "
"potrzebne wymienienie tego samego URI w wielu liniach, jeżeli pożądany jest "
@@ -6201,7 +6260,7 @@ msgstr ""
"sieciach o niskiej przepustowości łączy."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6218,7 +6277,7 @@ msgstr ""
"wypisywania żadnego ostrzeżenia):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6233,7 +6292,7 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6254,7 +6313,7 @@ msgstr ""
"w opcji konfiguracji <literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6272,7 +6331,7 @@ msgstr ""
"niezautentykowane."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6286,12 +6345,12 @@ msgstr ""
"komputerami w Internecie)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "Kilka przykładów:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6303,17 +6362,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "Określanie URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "Obecnie rozpoznawane są następujące typy URI:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6324,7 +6383,7 @@ msgstr ""
"archiwów."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6334,7 +6393,7 @@ msgstr ""
"list."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6351,7 +6410,7 @@ msgstr ""
"bezpieczny."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6371,7 +6430,7 @@ msgstr ""
"konfiguracyjnym serwery proxy używające HTTP zostaną zignorowane."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6384,7 +6443,7 @@ msgstr ""
"do skopiowania plików przy użyciu APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6398,12 +6457,12 @@ msgstr ""
"przetransferowania plików ze zdalnego komputera."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "dodawanie innych rozpoznawanych typów URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6422,7 +6481,7 @@ msgstr ""
"zobaczyć &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6431,36 +6490,36 @@ msgstr ""
"debian dla zasobów stable/main, stable/contrib i stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "Linie źródeł dla powyższego przykładu"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6471,7 +6530,7 @@ msgstr ""
"literal> i <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6481,7 +6540,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -6490,13 +6549,13 @@ msgstr ""
"org i dystrybucji hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -6505,13 +6564,13 @@ msgstr ""
"katalogu debian i używa tylko dystrybucji &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -6524,19 +6583,19 @@ msgstr ""
"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6555,7 +6614,7 @@ msgstr ""
"nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache;, &apt-conf;"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 7060351ce..c9a325bf0 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -1595,7 +1595,7 @@ msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
msgid "See Also"
@@ -5163,7 +5163,7 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
msgid "Examples"
msgstr "Exemplos"
@@ -6639,7 +6639,7 @@ msgstr ""
"linha <literal>deb-src</literal> para obter índices das fontes."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6648,21 +6648,57 @@ msgstr ""
"tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
-#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:82
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:100
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs. "
+#| "<literal>distribution</literal> can specify an exact path, in which case "
+#| "the components must be omitted and <literal>distribution</literal> must "
+#| "end with a slash (<literal>/</literal>). This is useful for the case when "
+#| "only a particular sub-section of the archive denoted by the URI is of "
+#| "interest. If <literal>distribution</literal> does not specify an exact "
+#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
"O URI para o tipo <literal>deb</literal> tem de especificar a base da "
@@ -6676,15 +6712,24 @@ msgstr ""
"presente."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
-msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+#: sources.list.5.xml:109
+#, fuzzy
+#| msgid ""
+#| "<literal>distribution</literal> may also contain a variable, <literal>"
+#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."
+msgid ""
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
"<literal>distribution</literal> também pode conter uma variável. <literal>"
"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
@@ -6695,18 +6740,32 @@ msgstr ""
"gerar automaticamente um URI com a arquitectura actual."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
-msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+#: sources.list.5.xml:117
+#, fuzzy
+#| msgid ""
+#| "Since only one distribution can be specified per line it may be necessary "
+#| "to have multiple lines for the same URI, if a subset of all available "
+#| "distributions or components at that location is desired. APT will sort "
+#| "the URI list after it has generated a complete set internally, and will "
+#| "collapse multiple references to the same Internet host, for instance, "
+#| "into a single connection, so that it does not inefficiently establish an "
+#| "FTP connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
"Como apenas pode ser especificada por linha uma distribuição, pode ser "
"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-"
@@ -6721,7 +6780,7 @@ msgstr ""
"sites com baixa largura de banda."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -6738,7 +6797,7 @@ msgstr ""
"definições não suportadas serão ignoradas em silêncio):"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -6753,7 +6812,7 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
#, fuzzy
#| msgid ""
#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6774,7 +6833,7 @@ msgstr ""
"<literal>APT::Architectures</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -6791,7 +6850,7 @@ msgstr ""
"lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6805,12 +6864,12 @@ msgstr ""
"Internet, por exemplo)."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
msgid "Some examples:"
msgstr "Alguns exemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6822,17 +6881,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr "Especificação da URI"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr "Os tipos de URI actualmente reconhecidos são:"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6843,7 +6902,7 @@ msgstr ""
"arquivos locais."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6853,7 +6912,7 @@ msgstr ""
"fontes."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -6870,7 +6929,7 @@ msgstr ""
"método de autenticação seguro."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -6891,7 +6950,7 @@ msgstr ""
"configuração serão ignorados."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6904,7 +6963,7 @@ msgstr ""
"ficheiros com o APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6918,12 +6977,12 @@ msgstr ""
"ficheiros a partir da máquina remota."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr "adicionando mais tipos de URI reconhecíveis"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -6942,7 +7001,7 @@ msgstr ""
"exemplo o debtorrent - veja &apt-transport-debtorrent;."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -6951,36 +7010,36 @@ msgstr ""
"para stable/main, stable/contrib, e stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr "Linha de fonte para o referido acima"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6991,7 +7050,7 @@ msgstr ""
"<literal>amd64</literal> e <literal>armel</literal>."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7001,7 +7060,7 @@ msgstr ""
"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -7010,13 +7069,13 @@ msgstr ""
"hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
@@ -7025,13 +7084,13 @@ msgstr ""
"usa apenas a área &stable-codename;/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -7044,19 +7103,19 @@ msgstr ""
"uma única sessão FTP para ambas linhas de recurso."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7075,7 +7134,7 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index a77b8319a..695d8dbea 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -1120,7 +1120,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:258
+#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
#: apt-ftparchive.1.xml:609
#, fuzzy
@@ -3615,7 +3615,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:217
+#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
#: apt-ftparchive.1.xml:598
#, fuzzy
msgid "Examples"
@@ -5096,60 +5096,86 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:79
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:83
+#: sources.list.5.xml:82
#, no-wrap
-msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:86
+#, no-wrap
+msgid ""
+" Type: deb\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Type: deb-src\n"
+" URI: http://example.com\n"
+" Suites: stable\n"
+" Sections: component1 component2\n"
+" [option1]: [option1-value]\n"
+" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:85
+#: sources.list.5.xml:84
+msgid ""
+"Alternatively a rfc822 style format is also supported: <placeholder type="
+"\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:100
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
-"<literal>distribution</literal> can specify an exact path, in which case the "
-"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (<literal>/</literal>). This is useful for the case when only a "
+"<literal>suite</literal> can specify an exact path, in which case the "
+"components must be omitted and <literal>suite</literal> must end with a "
+"slash (<literal>/</literal>). This is useful for the case when only a "
"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:109
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>"
-"$(ARCH)</literal> which expands to the Debian architecture (such as "
-"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-"This permits architecture-independent <filename>sources.list</filename> "
-"files to be used. In general this is only of interest when specifying an "
-"exact path, <literal>APT</literal> will automatically generate a URI with "
-"the current architecture otherwise."
+"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+"literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:102
+#: sources.list.5.xml:117
msgid ""
-"Since only one distribution can be specified per line it may be necessary to "
-"have multiple lines for the same URI, if a subset of all available "
-"distributions or components at that location is desired. APT will sort the "
-"URI list after it has generated a complete set internally, and will collapse "
-"multiple references to the same Internet host, for instance, into a single "
-"connection, so that it does not inefficiently establish an FTP connection, "
-"close it, do something else, and then re-establish a connection to that same "
-"host. This feature is useful for accessing busy FTP sites with limits on the "
-"number of simultaneous anonymous users. APT also parallelizes connections to "
-"different hosts to more effectively deal with sites with low bandwidth."
+"In the traditional style sources.list format since only one distribution can "
+"be specified per line it may be necessary to have multiple lines for the "
+"same URI, if a subset of all available distributions or components at that "
+"location is desired. APT will sort the URI list after it has generated a "
+"complete set internally, and will collapse multiple references to the same "
+"Internet host, for instance, into a single connection, so that it does not "
+"inefficiently establish an FTP connection, close it, do something else, and "
+"then re-establish a connection to that same host. This feature is useful for "
+"accessing busy FTP sites with limits on the number of simultaneous anonymous "
+"users. APT also parallelizes connections to different hosts to more "
+"effectively deal with sites with low bandwidth."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:131
msgid ""
"<literal>options</literal> is always optional and needs to be surrounded by "
"square brackets. It can consist of multiple settings in the form "
@@ -5160,7 +5186,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:137
msgid ""
"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> can be used to specify for which architectures "
@@ -5170,7 +5196,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:141
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -5179,7 +5205,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:144
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
"this source are always authenticated even if the <filename>Release</"
@@ -5190,7 +5216,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:151
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -5199,13 +5225,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:139
+#: sources.list.5.xml:156
#, fuzzy
msgid "Some examples:"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:158
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5214,17 +5240,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:147
+#: sources.list.5.xml:164
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:166
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:153
+#: sources.list.5.xml:170
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5232,14 +5258,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:177
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:184
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:"
@@ -5250,7 +5276,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:195
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -5263,7 +5289,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:190
+#: sources.list.5.xml:207
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -5272,7 +5298,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:197
+#: sources.list.5.xml:214
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5281,12 +5307,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:221
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:223
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme <package>apt-transport-"
@@ -5298,42 +5324,42 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:235
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:240
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:242
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:243
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:245
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5341,7 +5367,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:247
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5349,33 +5375,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:250
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:235
+#: sources.list.5.xml:252
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:254
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:256
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:258
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 "
@@ -5384,19 +5410,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:262
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:254
+#: sources.list.5.xml:271
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:264
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -5408,7 +5434,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:276
#, fuzzy
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 87fb4d71e..87f4d5fc5 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -20,7 +20,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2012-06-09T00:00:00Z</date>
+ <date>2014-01-18T00:00:00Z</date>
</refentryinfo>
<refmeta>
@@ -76,22 +76,37 @@
code in the same form as the <literal>deb</literal> type.
A <literal>deb-src</literal> line is required to fetch source indexes.</para>
-
<para>The format for a <filename>sources.list</filename> entry using the
<literal>deb</literal> and <literal>deb-src</literal> types is:</para>
- <literallayout>deb [ options ] uri distribution [component1] [component2] [...]</literallayout>
+ <literallayout>deb [ options ] uri suite [component1] [component2] [...]</literallayout>
+
+ <para>Alternatively a rfc822 style format is also supported:
+ <literallayout>
+ Type: deb
+ URI: http://example.com
+ Suites: stable
+ Sections: component1 component2
+ [option1]: [option1-value]
+
+ Type: deb-src
+ URI: http://example.com
+ Suites: stable
+ Sections: component1 component2
+ [option1]: [option1-value]
+ </literallayout>
+ </para>
<para>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
+ <literal>suite</literal> can specify an exact path, in which case the
+ components must be omitted and <literal>suite</literal> must end with
a slash (<literal>/</literal>). This is useful for the case when only a
particular sub-section of the archive denoted by the URI is of interest.
- If <literal>distribution</literal> does not specify an exact path, at least
+ If <literal>suite</literal> does not specify an exact path, at least
one <literal>component</literal> must be present.</para>
- <para><literal>distribution</literal> may also contain a variable,
+ <para><literal>suite</literal> may also contain a variable,
<literal>$(ARCH)</literal>
which expands to the Debian architecture (such as <literal>amd64</literal> or
<literal>armel</literal>) used on the system. This permits architecture-independent
@@ -99,17 +114,19 @@
of interest when specifying an exact path, <literal>APT</literal> will
automatically generate a URI with the current architecture otherwise.</para>
- <para>Since only one distribution can be specified per line it may be necessary
- to have multiple lines for the same URI, if a subset of all available
- distributions or components at that location is desired.
- APT will sort the URI list after it has generated a complete set
- internally, and will collapse multiple references to the same Internet
- host, for instance, into a single connection, so that it does not
- inefficiently establish an FTP connection, close it, do something else,
- and then re-establish a connection to that same host. This feature is
- useful for accessing busy FTP sites with limits on the number of
- simultaneous anonymous users. APT also parallelizes connections to
- different hosts to more effectively deal with sites with low bandwidth.</para>
+ <para>In the traditional style sources.list format since only one
+ distribution can be specified per line it may be necessary to have
+ multiple lines for the same URI, if a subset of all available
+ distributions or components at that location is desired. APT will
+ sort the URI list after it has generated a complete set internally,
+ and will collapse multiple references to the same Internet host,
+ for instance, into a single connection, so that it does not
+ inefficiently establish an FTP connection, close it, do something
+ else, and then re-establish a connection to that same host. This
+ feature is useful for accessing busy FTP sites with limits on the
+ number of simultaneous anonymous users. APT also parallelizes
+ connections to different hosts to more effectively deal with sites
+ with low bandwidth.</para>
<para><literal>options</literal> is always optional and needs to be surrounded by
square brackets. It can consist of multiple settings in the form
diff --git a/methods/rred.cc b/methods/rred.cc
index 7c65f8f92..d17ab110d 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -1,4 +1,10 @@
-// Includes /*{{{*/
+// Copyright (c) 2014 Anthony Towns
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
#include <config.h>
#include <apt-pkg/fileutl.h>
@@ -9,563 +15,664 @@
#include <apt-pkg/hashes.h>
#include <apt-pkg/configuration.h>
+#include <string>
+#include <list>
+#include <vector>
+#include <iterator>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
#include <utime.h>
-#include <stdio.h>
-#include <errno.h>
+
#include <apti18n.h>
- /*}}}*/
-/** \brief RredMethod - ed-style incremential patch method {{{
- *
- * This method implements a patch functionality similar to "patch --ed" that is
- * used by the "tiffany" incremental packages download stuff. It differs from
- * "ed" insofar that it is way more restricted (and therefore secure).
- * The currently supported ed commands are "<em>c</em>hange", "<em>a</em>dd" and
- * "<em>d</em>elete" (diff doesn't output any other).
- * Additionally the records must be reverse sorted by line number and
- * may not overlap (diff *seems* to produce this kind of output).
- * */
-class RredMethod : public pkgAcqMethod {
- bool Debug;
- // the size of this doesn't really matter (except for performance)
- const static int BUF_SIZE = 1024;
- // the supported ed commands
- enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'};
- // return values
- enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED};
-
- State applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file,
- unsigned long &line, char *buffer, Hashes *hash) const;
- void ignoreLineInFile(FileFd &fin, char *buffer) const;
- void copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines,
- Hashes *hash, char *buffer) const;
-
- State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
- State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
-
-protected:
- // the methods main method
- virtual bool Fetch(FetchItem *Itm);
-
-public:
- RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig), Debug(false) {};
+
+#define BLOCK_SIZE (512*1024)
+
+class MemBlock {
+ char *start;
+ size_t size;
+ char *free;
+ struct MemBlock *next;
+
+ MemBlock(size_t size)
+ {
+ free = start = new char[size];
+ size = size;
+ next = NULL;
+ }
+
+ size_t avail(void) { return size - (free - start); }
+
+ public:
+
+ MemBlock(void) {
+ free = start = new char[BLOCK_SIZE];
+ size = BLOCK_SIZE;
+ next = NULL;
+ }
+
+ ~MemBlock() {
+ delete [] start;
+ delete next;
+ }
+
+ void clear(void) {
+ free = start;
+ if (next)
+ next->clear();
+ }
+
+ char *add_easy(char *src, size_t len, char *last)
+ {
+ if (last) {
+ for (MemBlock *k = this; k; k = k->next) {
+ if (k->free == last) {
+ if (len <= k->avail()) {
+ char *n = k->add(src, len);
+ assert(last == n);
+ if (last == n)
+ return NULL;
+ return n;
+ } else {
+ break;
+ }
+ } else if (last >= start && last < free) {
+ break;
+ }
+ }
+ }
+ return add(src, len);
+ }
+
+ char *add(char *src, size_t len) {
+ if (len > avail()) {
+ if (!next) {
+ if (len > BLOCK_SIZE) {
+ next = new MemBlock(len);
+ } else {
+ next = new MemBlock;
+ }
+ }
+ return next->add(src, len);
+ }
+ char *dst = free;
+ free += len;
+ memcpy(dst, src, len);
+ return dst;
+ }
};
- /*}}}*/
-/** \brief applyFile - in reverse order with a tail recursion {{{
- *
- * As it is expected that the commands are in reversed order in the patch file
- * we check in the first half if the command is valid, but doesn't execute it
- * and move a step deeper. After reaching the end of the file we apply the
- * patches in the correct order: last found command first.
- *
- * \param ed_cmds patch file to apply
- * \param in_file base file we want to patch
- * \param out_file file to write the patched result to
- * \param line of command operation
- * \param buffer internal used read/write buffer
- * \param hash the created file for correctness
- * \return the success State of the ed command executor
- */
-RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file,
- unsigned long &line, char *buffer, Hashes *hash) const {
- // get the current command and parse it
- if (ed_cmds.ReadLine(buffer, BUF_SIZE) == NULL) {
- if (Debug == true)
- std::clog << "rred: encounter end of file - we can start patching now." << std::endl;
- line = 0;
- return ED_OK;
- }
-
- // parse in the effected linenumbers
- char* idx;
- errno=0;
- unsigned long const startline = strtol(buffer, &idx, 10);
- if (errno == ERANGE || errno == EINVAL) {
- _error->Errno("rred", "startline is an invalid number");
- return ED_PARSER;
- }
- if (startline > line) {
- _error->Error("rred: The start line (%lu) of the next command is higher than the last line (%lu). This is not allowed.", startline, line);
- return ED_ORDERING;
- }
- unsigned long stopline;
- if (*idx == ',') {
- idx++;
- errno=0;
- stopline = strtol(idx, &idx, 10);
- if (errno == ERANGE || errno == EINVAL) {
- _error->Errno("rred", "stopline is an invalid number");
- return ED_PARSER;
- }
- }
- else {
- stopline = startline;
- }
- line = startline;
-
- // which command to execute on this line(s)?
- switch (*idx) {
- case MODE_CHANGED:
- if (Debug == true)
- std::clog << "Change from line " << startline << " to " << stopline << std::endl;
- break;
- case MODE_ADDED:
- if (Debug == true)
- std::clog << "Insert after line " << startline << std::endl;
- break;
- case MODE_DELETED:
- if (Debug == true)
- std::clog << "Delete from line " << startline << " to " << stopline << std::endl;
- break;
- default:
- _error->Error("rred: Unknown ed command '%c'. Abort.", *idx);
- return ED_PARSER;
- }
- unsigned char mode = *idx;
-
- // save the current position
- unsigned const long long pos = ed_cmds.Tell();
-
- // if this is add or change then go to the next full stop
- unsigned int data_length = 0;
- if (mode == MODE_CHANGED || mode == MODE_ADDED) {
- do {
- ignoreLineInFile(ed_cmds, buffer);
- data_length++;
- }
- while (strncmp(buffer, ".", 1) != 0);
- data_length--; // the dot should not be copied
- }
-
- // do the recursive call - the last command is the one we need to execute at first
- const State child = applyFile(ed_cmds, in_file, out_file, line, buffer, hash);
- if (child != ED_OK) {
- return child;
- }
-
- // change and delete are working on "line" - add is done after "line"
- if (mode != MODE_ADDED)
- line++;
-
- // first wind to the current position and copy over all unchanged lines
- if (line < startline) {
- copyLinesFromFileToFile(in_file, out_file, (startline - line), hash, buffer);
- line = startline;
- }
-
- if (mode != MODE_ADDED)
- line--;
-
- // include data from ed script
- if (mode == MODE_CHANGED || mode == MODE_ADDED) {
- ed_cmds.Seek(pos);
- copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer);
- }
-
- // ignore the corresponding number of lines from input
- if (mode == MODE_CHANGED || mode == MODE_DELETED) {
- while (line < stopline) {
- ignoreLineInFile(in_file, buffer);
- line++;
- }
- }
- return ED_OK;
-}
- /*}}}*/
-void RredMethod::copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines,/*{{{*/
- Hashes *hash, char *buffer) const {
- while (0 < lines--) {
- do {
- fin.ReadLine(buffer, BUF_SIZE);
- unsigned long long const towrite = strlen(buffer);
- fout.Write(buffer, towrite);
- hash->Add((unsigned char*)buffer, towrite);
- } while (strlen(buffer) == (BUF_SIZE - 1) &&
- buffer[BUF_SIZE - 2] != '\n');
- }
-}
- /*}}}*/
-void RredMethod::ignoreLineInFile(FileFd &fin, char *buffer) const { /*{{{*/
- fin.ReadLine(buffer, BUF_SIZE);
- while (strlen(buffer) == (BUF_SIZE - 1) &&
- buffer[BUF_SIZE - 2] != '\n') {
- fin.ReadLine(buffer, BUF_SIZE);
- buffer[0] = ' ';
- }
-}
- /*}}}*/
-RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/
- FileFd &out_file, Hashes *hash) const {
- char buffer[BUF_SIZE];
-
- /* we do a tail recursion to read the commands in the right order */
- unsigned long line = -1; // assign highest possible value
- State const result = applyFile(Patch, From, out_file, line, buffer, hash);
-
- /* read the rest from infile */
- if (result == ED_OK) {
- while (From.ReadLine(buffer, BUF_SIZE) != NULL) {
- unsigned long long const towrite = strlen(buffer);
- out_file.Write(buffer, towrite);
- hash->Add((unsigned char*)buffer, towrite);
+
+struct Change {
+ /* Ordering:
+ *
+ * 1. write out <offset> lines unchanged
+ * 2. skip <del_cnt> lines from source
+ * 3. write out <add_cnt> lines (<add>/<add_len>)
+ */
+ size_t offset;
+ size_t del_cnt;
+ size_t add_cnt; /* lines */
+ size_t add_len; /* bytes */
+ char *add;
+
+ Change(int off)
+ {
+ offset = off;
+ del_cnt = add_cnt = add_len = 0;
+ add = NULL;
+ }
+
+ /* actually, don't write <lines> lines from <add> */
+ void skip_lines(size_t lines)
+ {
+ while (lines > 0) {
+ char *s = (char*) memchr(add, '\n', add_len);
+ assert(s != NULL);
+ s++;
+ add_len -= (s - add);
+ add_cnt--;
+ lines--;
+ if (add_len == 0) {
+ add = NULL;
+ assert(add_cnt == 0);
+ assert(lines == 0);
+ } else {
+ add = s;
+ assert(add_cnt > 0);
+ }
}
}
- return result;
-}
- /*}}}*/
-/* struct EdCommand {{{*/
-#ifdef _POSIX_MAPPED_FILES
-struct EdCommand {
- size_t data_start;
- size_t data_end;
- size_t data_lines;
- size_t first_line;
- size_t last_line;
- char type;
};
-#define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */
-static ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) {
- ssize_t Res;
- errno = 0;
- ssize_t i = 0;
- do {
- Res = writev(fd, iov + i, iovcnt);
- if (Res < 0 && errno == EINTR)
- continue;
- if (Res < 0)
- return _error->Errno("writev",_("Write error"));
- iovcnt -= Res;
- i += Res;
- } while (Res > 0 && iovcnt > 0);
- return i;
-}
-#endif
- /*}}}*/
-RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/
- FileFd &out_file, Hashes *hash) const {
-#ifdef _POSIX_MAPPED_FILES
- MMap ed_cmds(Patch, MMap::ReadOnly);
- MMap in_file(From, MMap::ReadOnly);
-
- unsigned long long const ed_size = ed_cmds.Size();
- unsigned long long const in_size = in_file.Size();
- if (ed_size == 0 || in_size == 0)
- return MMAP_FAILED;
-
- EdCommand* commands = 0;
- size_t command_count = 0;
- size_t command_alloc = 0;
-
- const char* begin = (char*) ed_cmds.Data();
- const char* end = begin;
- const char* ed_end = (char*) ed_cmds.Data() + ed_size;
-
- const char* input = (char*) in_file.Data();
- const char* input_end = (char*) in_file.Data() + in_size;
-
- size_t i;
-
- /* 1. Parse entire script. It is executed in reverse order, so we cather it
- * in the `commands' buffer first
- */
-
- for(;;) {
- EdCommand cmd;
- cmd.data_start = 0;
- cmd.data_end = 0;
-
- while(begin != ed_end && *begin == '\n')
- ++begin;
- while(end != ed_end && *end != '\n')
- ++end;
- if(end == ed_end && begin == end)
- break;
-
- /* Determine command range */
- const char* tmp = begin;
-
- for(;;) {
- /* atoll is safe despite lacking NUL-termination; we know there's an
- * alphabetic character at end[-1]
- */
- if(tmp == end) {
- cmd.first_line = atol(begin);
- cmd.last_line = cmd.first_line;
- break;
- }
- if(*tmp == ',') {
- cmd.first_line = atol(begin);
- cmd.last_line = atol(tmp + 1);
- break;
- }
- ++tmp;
- }
-
- // which command to execute on this line(s)?
- switch (end[-1]) {
- case MODE_CHANGED:
- if (Debug == true)
- std::clog << "Change from line " << cmd.first_line << " to " << cmd.last_line << std::endl;
- break;
- case MODE_ADDED:
- if (Debug == true)
- std::clog << "Insert after line " << cmd.first_line << std::endl;
- break;
- case MODE_DELETED:
- if (Debug == true)
- std::clog << "Delete from line " << cmd.first_line << " to " << cmd.last_line << std::endl;
- break;
- default:
- _error->Error("rred: Unknown ed command '%c'. Abort.", end[-1]);
- free(commands);
- return ED_PARSER;
- }
- cmd.type = end[-1];
-
- /* Determine the size of the inserted text, so we don't have to scan this
- * text again later.
- */
- begin = end + 1;
- end = begin;
- cmd.data_lines = 0;
-
- if(cmd.type == MODE_ADDED || cmd.type == MODE_CHANGED) {
- cmd.data_start = begin - (char*) ed_cmds.Data();
- while(end != ed_end) {
- if(*end == '\n') {
- if(end[-1] == '.' && end[-2] == '\n')
- break;
- ++cmd.data_lines;
- }
- ++end;
- }
- cmd.data_end = end - (char*) ed_cmds.Data() - 1;
- begin = end + 1;
- end = begin;
- }
- if(command_count == command_alloc) {
- command_alloc = (command_alloc + 64) * 3 / 2;
- EdCommand* newCommands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand));
- if (newCommands == NULL) {
- free(commands);
- return MMAP_FAILED;
- }
- commands = newCommands;
- }
- commands[command_count++] = cmd;
- }
-
- struct iovec* iov = new struct iovec[IOV_COUNT];
- size_t iov_size = 0;
-
- size_t amount, remaining;
- size_t line = 1;
- EdCommand* cmd;
-
- /* 2. Execute script. We gather writes in a `struct iov' array, and flush
- * using writev to minimize the number of system calls. Data is read
- * directly from the memory mappings of the input file and the script.
- */
-
- for(i = command_count; i-- > 0; ) {
- cmd = &commands[i];
- if(cmd->type == MODE_ADDED)
- amount = cmd->first_line + 1;
- else
- amount = cmd->first_line;
-
- if(line < amount) {
- begin = input;
- while(line != amount) {
- input = (const char*) memchr(input, '\n', input_end - input);
- if(!input)
- break;
- ++line;
- ++input;
- }
-
- iov[iov_size].iov_base = (void*) begin;
- iov[iov_size].iov_len = input - begin;
- hash->Add((const unsigned char*) begin, input - begin);
-
- if(++iov_size == IOV_COUNT) {
- retry_writev(out_file.Fd(), iov, IOV_COUNT);
- iov_size = 0;
- }
- }
-
- if(cmd->type == MODE_DELETED || cmd->type == MODE_CHANGED) {
- remaining = (cmd->last_line - cmd->first_line) + 1;
- line += remaining;
- while(remaining) {
- input = (const char*) memchr(input, '\n', input_end - input);
- if(!input)
- break;
- --remaining;
- ++input;
- }
- }
-
- if(cmd->type == MODE_CHANGED || cmd->type == MODE_ADDED) {
- if(cmd->data_end != cmd->data_start) {
- iov[iov_size].iov_base = (void*) ((char*)ed_cmds.Data() + cmd->data_start);
- iov[iov_size].iov_len = cmd->data_end - cmd->data_start;
- hash->Add((const unsigned char*) ((char*)ed_cmds.Data() + cmd->data_start),
- iov[iov_size].iov_len);
-
- if(++iov_size == IOV_COUNT) {
- retry_writev(out_file.Fd(), iov, IOV_COUNT);
- iov_size = 0;
- }
- }
- }
- }
-
- if(input != input_end) {
- iov[iov_size].iov_base = (void*) input;
- iov[iov_size].iov_len = input_end - input;
- hash->Add((const unsigned char*) input, input_end - input);
- ++iov_size;
- }
-
- if(iov_size) {
- retry_writev(out_file.Fd(), iov, iov_size);
- iov_size = 0;
- }
-
- for(i = 0; i < iov_size; i += IOV_COUNT) {
- if(iov_size - i < IOV_COUNT)
- retry_writev(out_file.Fd(), iov + i, iov_size - i);
- else
- retry_writev(out_file.Fd(), iov + i, IOV_COUNT);
- }
-
- delete [] iov;
- free(commands);
-
- return ED_OK;
+
+class FileChanges {
+ std::list<struct Change> changes;
+ std::list<struct Change>::iterator where;
+ size_t pos; // line number is as far left of iterator as possible
+
+ bool pos_is_okay(void)
+ {
+#ifdef POSDEBUG
+ size_t cpos = 0;
+ std::list<struct Change>::iterator x;
+ for (x = changes.begin(); x != where; x++) {
+ assert(x != changes.end());
+ cpos += x->offset + x->add_cnt;
+ }
+ return cpos == pos;
#else
- return MMAP_FAILED;
+ return true;
#endif
-}
- /*}}}*/
-bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/
-{
- Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
- URI Get = Itm->Uri;
- std::string Path = Get.Host + Get.Path; // To account for relative paths
-
- FetchResult Res;
- Res.Filename = Itm->DestFile;
- if (Itm->Uri.empty() == true) {
- Path = Itm->DestFile;
- Itm->DestFile.append(".result");
- } else
- URIStart(Res);
-
- if (Debug == true)
- std::clog << "Patching " << Path << " with " << Path
- << ".ed and putting result into " << Itm->DestFile << std::endl;
- // Open the source and destination files (the d'tor of FileFd will do
- // the cleanup/closing of the fds)
- FileFd From(Path,FileFd::ReadOnly);
- FileFd Patch(Path+".ed",FileFd::ReadOnly, FileFd::Gzip);
- FileFd To(Itm->DestFile,FileFd::WriteAtomic);
- To.EraseOnFailure();
- if (_error->PendingError() == true)
- return false;
-
- Hashes Hash;
- // now do the actual patching
- State const result = patchMMap(Patch, From, To, &Hash);
- if (result == MMAP_FAILED) {
- // retry with patchFile
- Patch.Seek(0);
- From.Seek(0);
- To.Open(Itm->DestFile,FileFd::WriteAtomic);
- if (_error->PendingError() == true)
- return false;
- if (patchFile(Patch, From, To, &Hash) != ED_OK) {
- return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str());
- } else if (Debug == true) {
- std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl;
+ }
+
+ public:
+ FileChanges() {
+ where = changes.end();
+ pos = 0;
+ }
+
+ std::list<struct Change>::iterator begin(void) { return changes.begin(); }
+ std::list<struct Change>::iterator end(void) { return changes.end(); }
+
+ std::list<struct Change>::reverse_iterator rbegin(void) { return changes.rbegin(); }
+ std::list<struct Change>::reverse_iterator rend(void) { return changes.rend(); }
+
+ void add_change(Change c) {
+ assert(pos_is_okay());
+ go_to_change_for(c.offset);
+ assert(pos + where->offset == c.offset);
+ if (c.del_cnt > 0)
+ delete_lines(c.del_cnt);
+ assert(pos + where->offset == c.offset);
+ if (c.add_len > 0) {
+ assert(pos_is_okay());
+ if (where->add_len > 0)
+ new_change();
+ assert(where->add_len == 0 && where->add_cnt == 0);
+
+ where->add_len = c.add_len;
+ where->add_cnt = c.add_cnt;
+ where->add = c.add;
}
- } else if (result != ED_OK) {
- return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str());
- } else if (Debug == true) {
- std::clog << "rred: finished mmap patching of " << Path << std::endl;
+ assert(pos_is_okay());
+ merge();
+ assert(pos_is_okay());
}
- // write out the result
- From.Close();
- Patch.Close();
- To.Close();
-
- /* Transfer the modification times from the patch file
- to be able to see in which state the file should be
- and use the access time from the "old" file */
- struct stat BufBase, BufPatch;
- if (stat(Path.c_str(),&BufBase) != 0 ||
- stat(std::string(Path+".ed").c_str(),&BufPatch) != 0)
- return _error->Errno("stat",_("Failed to stat"));
-
- struct utimbuf TimeBuf;
- TimeBuf.actime = BufBase.st_atime;
- TimeBuf.modtime = BufPatch.st_mtime;
- if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
- return _error->Errno("utime",_("Failed to set modification time"));
-
- if (stat(Itm->DestFile.c_str(),&BufBase) != 0)
- return _error->Errno("stat",_("Failed to stat"));
-
- // return done
- Res.LastModified = BufBase.st_mtime;
- Res.Size = BufBase.st_size;
- Res.TakeHashes(Hash);
- URIDone(Res);
-
- return true;
-}
- /*}}}*/
-/** \brief Wrapper class for testing rred */ /*{{{*/
-class TestRredMethod : public RredMethod {
-public:
- /** \brief Run rred in debug test mode
- *
- * This method can be used to run the rred method outside
- * of the "normal" acquire environment for easier testing.
- *
- * \param base basename of all files involved in this rred test
- */
- bool Run(char const *base) {
- _config->CndSet("Debug::pkgAcquire::RRed", "true");
- FetchItem *test = new FetchItem;
- test->DestFile = base;
- return Fetch(test);
- }
+ private:
+ void merge(void)
+ {
+ while (where->offset == 0 && where != changes.begin()) {
+ left();
+ }
+ std::list<struct Change>::iterator next = where;
+ next++;
+
+ while (next != changes.end() && next->offset == 0) {
+ where->del_cnt += next->del_cnt;
+ next->del_cnt = 0;
+ if (next->add == NULL) {
+ next = changes.erase(next);
+ } else if (where->add == NULL) {
+ where->add = next->add;
+ where->add_len = next->add_len;
+ where->add_cnt = next->add_cnt;
+ next = changes.erase(next);
+ } else {
+ next++;
+ }
+ }
+ }
+
+ void go_to_change_for(size_t line)
+ {
+ while(where != changes.end()) {
+ if (line < pos) {
+ left();
+ continue;
+ }
+ if (pos + where->offset + where->add_cnt <= line) {
+ right();
+ continue;
+ }
+ // line is somewhere in this slot
+ if (line < pos + where->offset) {
+ break;
+ } else if (line == pos + where->offset) {
+ return;
+ } else {
+ split(line - pos);
+ right();
+ return;
+ }
+ }
+ /* it goes before this patch */
+ insert(line-pos);
+ }
+
+ void new_change(void) { insert(where->offset); }
+
+ void insert(size_t offset)
+ {
+ assert(pos_is_okay());
+ assert(where == changes.end() || offset <= where->offset);
+ if (where != changes.end())
+ where->offset -= offset;
+ changes.insert(where, Change(offset));
+ where--;
+ assert(pos_is_okay());
+ }
+
+ void split(size_t offset)
+ {
+ assert(pos_is_okay());
+
+ assert(where->offset < offset);
+ assert(offset < where->offset + where->add_cnt);
+
+ size_t keep_lines = offset - where->offset;
+
+ Change before(*where);
+
+ where->del_cnt = 0;
+ where->offset = 0;
+ where->skip_lines(keep_lines);
+
+ before.add_cnt = keep_lines;
+ before.add_len -= where->add_len;
+
+ changes.insert(where, before);
+ where--;
+ assert(pos_is_okay());
+ }
+
+ size_t check_next_offset(size_t max)
+ {
+ assert(pos_is_okay());
+ if (max > 0)
+ {
+ where++;
+ if (where != changes.end()) {
+ if (where->offset < max)
+ max = where->offset;
+ }
+ where--;
+ assert(pos_is_okay());
+ }
+ return max;
+ }
+
+ void delete_lines(size_t cnt)
+ {
+ std::list<struct Change>::iterator x = where;
+ assert(pos_is_okay());
+ while (cnt > 0)
+ {
+ size_t del;
+ del = x->add_cnt;
+ if (del > cnt)
+ del = cnt;
+ x->skip_lines(del);
+ cnt -= del;
+
+ x++;
+ if (x == changes.end()) {
+ del = cnt;
+ } else {
+ del = x->offset;
+ if (del > cnt)
+ del = cnt;
+ x->offset -= del;
+ }
+ where->del_cnt += del;
+ cnt -= del;
+ }
+ assert(pos_is_okay());
+ }
+
+ void left(void) {
+ assert(pos_is_okay());
+ where--;
+ pos -= where->offset + where->add_cnt;
+ assert(pos_is_okay());
+ }
+
+ void right(void) {
+ assert(pos_is_okay());
+ pos += where->offset + where->add_cnt;
+ where++;
+ assert(pos_is_okay());
+ }
};
- /*}}}*/
-/** \brief Starter for the rred method (or its test method) {{{
- *
- * Used without parameters is the normal behavior for methods for
- * the APT acquire system. While this works great for the acquire system
- * it is very hard to test the method and therefore the method also
- * accepts one parameter which will switch it directly to debug test mode:
- * The test mode expects that if "Testfile" is given as parameter
- * the file "Testfile" should be ed-style patched with "Testfile.ed"
- * and will write the result to "Testfile.result".
- */
-int main(int argc, char *argv[]) {
- if (argc <= 1) {
- RredMethod Mth;
- return Mth.Run();
- } else {
- TestRredMethod Mth;
- bool result = Mth.Run(argv[1]);
- _error->DumpErrors();
- return result;
- }
+
+class Patch {
+ FileChanges filechanges;
+ MemBlock add_text;
+
+ static bool retry_fwrite(char *b, size_t l, FILE *f, Hashes *hash)
+ {
+ size_t r = 1;
+ while (r > 0 && l > 0)
+ {
+ r = fwrite(b, 1, l, f);
+ if (hash)
+ hash->Add((unsigned char*)b, r);
+ l -= r;
+ b += r;
+ }
+ return l == 0;
+ }
+
+ static void dump_rest(FILE *o, FILE *i, Hashes *hash)
+ {
+ char buffer[BLOCK_SIZE];
+ size_t l;
+ while (0 < (l = fread(buffer, 1, sizeof(buffer), i))) {
+ if (!retry_fwrite(buffer, l, o, hash))
+ break;
+ }
+ }
+
+ static void dump_lines(FILE *o, FILE *i, size_t n, Hashes *hash)
+ {
+ char buffer[BLOCK_SIZE];
+ size_t l;
+ while (n > 0) {
+ if (fgets(buffer, sizeof(buffer), i) == 0)
+ buffer[0] = '\0';
+ l = strlen(buffer);
+ if (l == 0 || buffer[l-1] == '\n')
+ n--;
+ retry_fwrite(buffer, l, o, hash);
+ }
+ }
+
+ static void skip_lines(FILE *i, int n)
+ {
+ char buffer[BLOCK_SIZE];
+ size_t l;
+ while (n > 0) {
+ if (fgets(buffer, sizeof(buffer), i) == 0)
+ buffer[0] = '\0';
+ l = strlen(buffer);
+ if (l == 0 || buffer[l-1] == '\n')
+ n--;
+ }
+ }
+
+ static void dump_mem(FILE *o, char *p, size_t s, Hashes *hash) {
+ retry_fwrite(p, s, o, hash);
+ }
+
+ public:
+
+ void read_diff(FileFd &f)
+ {
+ char buffer[BLOCK_SIZE];
+ bool cmdwanted = true;
+
+ Change ch(0);
+ while(f.ReadLine(buffer, sizeof(buffer)))
+ {
+ if (cmdwanted) {
+ char *m, *c;
+ size_t s, e;
+ s = strtol(buffer, &m, 10);
+ if (m == buffer) {
+ s = e = ch.offset + ch.add_cnt;
+ c = buffer;
+ } else if (*m == ',') {
+ m++;
+ e = strtol(m, &c, 10);
+ } else {
+ e = s;
+ c = m;
+ }
+ switch(*c) {
+ case 'a':
+ cmdwanted = false;
+ ch.add = NULL;
+ ch.add_cnt = 0;
+ ch.add_len = 0;
+ ch.offset = s;
+ ch.del_cnt = 0;
+ break;
+ case 'c':
+ cmdwanted = false;
+ ch.add = NULL;
+ ch.add_cnt = 0;
+ ch.add_len = 0;
+ ch.offset = s - 1;
+ ch.del_cnt = e - s + 1;
+ break;
+ case 'd':
+ ch.offset = s - 1;
+ ch.del_cnt = e - s + 1;
+ ch.add = NULL;
+ ch.add_cnt = 0;
+ ch.add_len = 0;
+ filechanges.add_change(ch);
+ break;
+ }
+ } else { /* !cmdwanted */
+ if (buffer[0] == '.' && buffer[1] == '\n') {
+ cmdwanted = true;
+ filechanges.add_change(ch);
+ } else {
+ char *last = NULL;
+ char *add;
+ size_t l;
+ if (ch.add)
+ last = ch.add + ch.add_len;
+ l = strlen(buffer);
+ add = add_text.add_easy(buffer, l, last);
+ if (!add) {
+ ch.add_len += l;
+ ch.add_cnt++;
+ } else {
+ if (ch.add) {
+ filechanges.add_change(ch);
+ ch.del_cnt = 0;
+ }
+ ch.offset += ch.add_cnt;
+ ch.add = add;
+ ch.add_len = l;
+ ch.add_cnt = 1;
+ }
+ }
+ }
+ }
+ }
+
+ void write_diff(FILE *f)
+ {
+ size_t line = 0;
+ std::list<struct Change>::reverse_iterator ch;
+ for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) {
+ line += ch->offset + ch->del_cnt;
+ }
+
+ for (ch = filechanges.rbegin(); ch != filechanges.rend(); ch++) {
+ std::list<struct Change>::reverse_iterator mg_i, mg_e = ch;
+ while (ch->del_cnt == 0 && ch->offset == 0)
+ ch++;
+ line -= ch->del_cnt;
+ if (ch->add_cnt > 0) {
+ if (ch->del_cnt == 0) {
+ fprintf(f, "%lua\n", line);
+ } else if (ch->del_cnt == 1) {
+ fprintf(f, "%luc\n", line+1);
+ } else {
+ fprintf(f, "%lu,%luc\n", line+1, line+ch->del_cnt);
+ }
+
+ mg_i = ch;
+ do {
+ dump_mem(f, mg_i->add, mg_i->add_len, NULL);
+ } while (mg_i-- != mg_e);
+
+ fprintf(f, ".\n");
+ } else if (ch->del_cnt == 1) {
+ fprintf(f, "%lud\n", line+1);
+ } else if (ch->del_cnt > 1) {
+ fprintf(f, "%lu,%lud\n", line+1, line+ch->del_cnt);
+ }
+ line -= ch->offset;
+ }
+ }
+
+ void apply_against_file(FILE *out, FILE *in, Hashes *hash = NULL)
+ {
+ std::list<struct Change>::iterator ch;
+ for (ch = filechanges.begin(); ch != filechanges.end(); ch++) {
+ dump_lines(out, in, ch->offset, hash);
+ skip_lines(in, ch->del_cnt);
+ dump_mem(out, ch->add, ch->add_len, hash);
+ }
+ dump_rest(out, in, hash);
+ }
+};
+
+class RredMethod : public pkgAcqMethod {
+ private:
+ bool Debug;
+
+ protected:
+ virtual bool Fetch(FetchItem *Itm) {
+ Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
+ URI Get = Itm->Uri;
+ std::string Path = Get.Host + Get.Path; // rred:/path - no host
+
+ FetchResult Res;
+ Res.Filename = Itm->DestFile;
+ if (Itm->Uri.empty())
+ {
+ Path = Itm->DestFile;
+ Itm->DestFile.append(".result");
+ } else
+ URIStart(Res);
+
+ std::vector<std::string> patchpaths;
+ Patch patch;
+
+ if (FileExists(Path + ".ed") == true)
+ patchpaths.push_back(Path + ".ed");
+ else
+ {
+ _error->PushToStack();
+ std::vector<std::string> patches = GetListOfFilesInDir(flNotFile(Path), "gz", true, false);
+ _error->RevertToStack();
+
+ std::string const baseName = Path + ".ed.";
+ for (std::vector<std::string>::const_iterator p = patches.begin();
+ p != patches.end(); ++p)
+ if (p->compare(0, baseName.length(), baseName) == 0)
+ patchpaths.push_back(*p);
+ }
+
+ std::string patch_name;
+ for (std::vector<std::string>::iterator I = patchpaths.begin();
+ I != patchpaths.end();
+ I++)
+ {
+ patch_name = *I;
+ if (Debug == true)
+ std::clog << "Patching " << Path << " with " << patch_name
+ << std::endl;
+
+ FileFd p;
+ // all patches are compressed, even if the name doesn't reflect it
+ if (p.Open(patch_name, FileFd::ReadOnly, FileFd::Gzip) == false) {
+ std::cerr << "Could not open patch file " << patch_name << std::endl;
+ _error->DumpErrors(std::cerr);
+ abort();
+ }
+ patch.read_diff(p);
+ p.Close();
+ }
+
+ if (Debug == true)
+ std::clog << "Applying patches against " << Path
+ << " and writing results to " << Itm->DestFile
+ << std::endl;
+
+ FILE *inp = fopen(Path.c_str(), "r");
+ FILE *out = fopen(Itm->DestFile.c_str(), "w");
+
+ Hashes hash;
+
+ patch.apply_against_file(out, inp, &hash);
+
+ fclose(out);
+ fclose(inp);
+
+ if (Debug == true) {
+ std::clog << "rred: finished file patching of " << Path << "." << std::endl;
+ }
+
+ struct stat bufbase, bufpatch;
+ if (stat(Path.c_str(), &bufbase) != 0 ||
+ stat(patch_name.c_str(), &bufpatch) != 0)
+ return _error->Errno("stat", _("Failed to stat"));
+
+ struct utimbuf timebuf;
+ timebuf.actime = bufbase.st_atime;
+ timebuf.modtime = bufpatch.st_mtime;
+ if (utime(Itm->DestFile.c_str(), &timebuf) != 0)
+ return _error->Errno("utime", _("Failed to set modification time"));
+
+ if (stat(Itm->DestFile.c_str(), &bufbase) != 0)
+ return _error->Errno("stat", _("Failed to stat"));
+
+ Res.LastModified = bufbase.st_mtime;
+ Res.Size = bufbase.st_size;
+ Res.TakeHashes(hash);
+ URIDone(Res);
+
+ return true;
+ }
+
+ public:
+ RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig) {}
+};
+
+int main(int argc, char **argv)
+{
+ int i;
+ bool just_diff = true;
+ Patch patch;
+
+ if (argc <= 1) {
+ RredMethod Mth;
+ return Mth.Run();
+ }
+
+ if (argc > 1 && strcmp(argv[1], "-f") == 0) {
+ just_diff = false;
+ i = 2;
+ } else {
+ i = 1;
+ }
+
+ for (; i < argc; i++) {
+ FileFd p;
+ if (p.Open(argv[i], FileFd::ReadOnly) == false) {
+ _error->DumpErrors(std::cerr);
+ exit(1);
+ }
+ patch.read_diff(p);
+ }
+
+ if (just_diff) {
+ patch.write_diff(stdout);
+ } else {
+ FILE *out, *inp;
+ out = stdout;
+ inp = stdin;
+
+ patch.apply_against_file(out, inp);
+ }
+ return 0;
}
- /*}}}*/
diff --git a/po/ar.po b/po/ar.po
index 081e8de47..df852f62f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -104,7 +104,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "لم يُعثر على أية حزم"
@@ -592,13 +592,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -635,11 +638,11 @@ msgid "File not found"
msgstr "لم يُعثر على الملف"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "فشيل تنفيذ stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "فشل تعيين وقت التعديل"
@@ -714,9 +717,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "خطأ في الكتابة"
@@ -970,7 +973,7 @@ msgstr "فشل الاتصال"
msgid "Internal error"
msgstr "خطأ داخلي"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1203,101 +1206,101 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟"
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [مُثبّتة]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [مُثبّتة]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [مُثبّتة]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "إلا أن %s مثبت"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "إلا أنه سيتم تثبيت %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "إلا أنه غير قابل للتثبيت"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "إلا أنها حزمة وهمية"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "إلا أنها غير مثبتة"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "إلا أنه لن يتم تثبيتها"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " أو"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "سيتم إزالة الحزم التالية:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "سيتم الإبقاء على الحزم التالية:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "ستتم ترقية الحزم التالية:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "سيتم تثبيط الحزم التالية:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "سيتم تغيير الحزم المبقاة التالية:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (بسبب %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1305,27 +1308,27 @@ msgstr ""
"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu أعيد تثبيتها، "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu مثبطة، "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
@@ -1334,7 +1337,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1342,21 +1345,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1414,7 +1417,7 @@ msgstr "تمّ"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1426,12 +1429,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "فشل تغيير اسم %s إلى %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1477,8 +1480,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1516,20 +1519,6 @@ msgstr "فشل إغلاق الملف %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2506,76 +2495,86 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "فتح %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:386
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2787,35 +2786,35 @@ msgstr "الحجم غير متطابق"
msgid "Invalid file format"
msgstr "عمليّة غير صالحة %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2823,24 +2822,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/ast.po b/po/ast.po
index 723546842..06a3a5987 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -97,7 +97,7 @@ msgstr "El ficheru de paquetes %s nun ta sincronizáu."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nun s'alcontraron paquetes"
@@ -698,13 +698,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -741,11 +744,11 @@ msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Falló al lleer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificación"
@@ -820,9 +823,9 @@ msgstr "Una rempuesta revirtió'l buffer."
msgid "Protocol corruption"
msgstr "Corrupción del protocolu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Fallu d'escritura"
@@ -1079,7 +1082,7 @@ msgstr "Fallo la conexón"
msgid "Internal error"
msgstr "Fallu internu"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1325,101 +1328,101 @@ msgstr "¿Instalar esos paquetes ensin verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes nun cumplen dependencies:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "pero %s ta instaláu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s ta pa instalar"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "pero nun ye instalable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "pero ye un paquete virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "pero nun ta instaláu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "pero nun va instalase"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Van instalase los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes van DESANICIASE:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes tan reteníos:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Los siguientes paquetes van actualizase:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Van camudase los siguientes paquetes reteníos:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1427,27 +1430,27 @@ msgstr ""
"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizaos, %lu nuevos instalaos, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalaos, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizaos, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
@@ -1456,7 +1459,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1464,21 +1467,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación d'espresión regular - %s"
@@ -1536,7 +1539,7 @@ msgstr "Fecho"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1553,12 +1556,12 @@ msgstr ""
" asina que nun dependen de la pertinencia de la verdadera situación "
"actual!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nun pudo renomase %s como %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1604,8 +1607,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1643,24 +1646,6 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'"
msgid "[Mirror: %s]"
msgstr "[Espeyu: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el "
-"parche parez corruptu."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) - "
-"el parche parez corruptu."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falló criar un tubu IPC al soprocesu"
@@ -2720,79 +2705,89 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3014,35 +3009,35 @@ msgstr "El tamañu nun concasa"
msgid "Invalid file format"
msgstr "Operación incorreuta: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3052,12 +3047,12 @@ msgstr ""
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3066,12 +3061,12 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3499,6 +3494,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el "
+#~ "parche parez corruptu."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) "
+#~ "- el parche parez corruptu."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, escoyendo '%s' pa la xera '%s'\n"
diff --git a/po/bg.po b/po/bg.po
index bb93a3e72..649a0a66a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -103,7 +103,7 @@ msgstr "Пакетният файл %s не е синхронизиран."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Няма намерени пакети"
@@ -724,13 +724,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -767,11 +770,11 @@ msgid "File not found"
msgstr "Файлът не е намерен"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Неуспех при получаването на атрибути"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Неуспех при задаването на време на промяна"
@@ -846,9 +849,9 @@ msgstr "Отговорът препълни буфера."
msgid "Protocol corruption"
msgstr "Развален протокол"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Грешка при запис"
@@ -1110,7 +1113,7 @@ msgstr "Неуспех при свързването"
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1358,101 +1361,101 @@ msgstr "Инсталиране на тези пакети без проверк
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Инсталиран]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Инсталиран]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Инсталиран]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Следните пакети имат неудовлетворени зависимости:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "но е инсталиран %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "но ще бъде инсталиран %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "но той не може да бъде инсталиран"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "но той е виртуален пакет"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "но той не е инсталиран"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "но той няма да бъде инсталиран"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Следните пакети няма да бъдат променени:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Следните пакети ще бъдат актуализирани:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Следните задържани пакети ще бъдат променени:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (поради %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1460,27 +1463,27 @@ msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu актуализирани, %lu нови инсталирани, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu преинсталирани, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu върнати към по-стара версия, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu за премахване и %lu без промяна.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu не са напълно инсталирани или премахнати.\n"
@@ -1489,7 +1492,7 @@ msgstr "%lu не са напълно инсталирани или премах
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1497,21 +1500,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -1571,7 +1574,7 @@ msgstr "Готово"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1587,12 +1590,12 @@ msgstr ""
" Заключването е деактивирано, така че не разчитайте\n"
" на повтаряемост в реална ситуация."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Неуспех при преименуването на %s на %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1638,8 +1641,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1677,24 +1680,6 @@ msgstr "Грешка при четене файла „%s“ от огледал
msgid "[Mirror: %s]"
msgstr "[Огледален сървър: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда "
-"повредена."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – "
-"кръпката изглежда повредена."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Неуспех при създаването на IPC pipe към подпроцеса"
@@ -2758,83 +2743,93 @@ msgstr "Неуспех при анализирането на пакетен ф
msgid "Unable to parse package file %s (2)"
msgstr "Неуспех при анализирането на пакетен файл %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
"стойност)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Отваряне на %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Ред %u в списъка с източници %s е твърде дълъг."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3066,7 +3061,7 @@ msgstr "Несъответствие на размера"
msgid "Invalid file format"
msgstr "Невалидна операция %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3075,16 +3070,16 @@ msgstr ""
"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
"list или повреден файл)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Не е открита контролна сума за „%s“ във файла Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3093,12 +3088,12 @@ msgstr ""
"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
"прилагат обновявания от това хранилище."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3108,12 +3103,12 @@ msgstr ""
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3122,12 +3117,12 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3556,6 +3551,20 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
+#~ 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) – "
+#~ "кръпката изглежда повредена."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Избиране на %s за задача „%s“\n"
diff --git a/po/bs.po b/po/bs.po
index 1f3a0a13a..a7c3886c1 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -100,7 +100,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Paketi nisu pronađeni"
@@ -598,13 +598,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -641,11 +644,11 @@ msgid "File not found"
msgstr "Datoteka nije pronađena"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr ""
@@ -719,9 +722,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr "Oštećenje protokola"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Greška pri pisanju"
@@ -976,7 +979,7 @@ msgstr "Povezivanje neuspješno"
msgid "Internal error"
msgstr "Unutrašnja greška"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1203,128 +1206,128 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ili"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1333,7 +1336,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1341,21 +1344,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1412,7 +1415,7 @@ msgstr "Urađeno"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1424,12 +1427,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Ne mogu otvoriti %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1472,8 +1475,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1511,20 +1514,6 @@ msgstr "Ne mogu otvoriti %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2501,76 +2490,86 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:386
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2780,35 +2779,35 @@ msgstr ""
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2816,24 +2815,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/ca.po b/po/ca.po
index be559ae68..d2d5d26ec 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -100,7 +100,7 @@ msgstr "El fitxer %s del paquet està desincronitzat."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "No s'han trobat paquets"
@@ -709,13 +709,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -752,11 +755,11 @@ msgid "File not found"
msgstr "Fitxer no trobat"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -831,9 +834,9 @@ msgstr "Una resposta ha desbordat la memòria intermèdia."
msgid "Protocol corruption"
msgstr "Protocol corromput"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Error d'escriptura"
@@ -1095,7 +1098,7 @@ msgstr "Ha fallat la connexió"
msgid "Internal error"
msgstr "Error intern"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1348,101 +1351,101 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "però està instaŀlat %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instaŀlarà %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "però no és instaŀlable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "però no està instaŀlat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "però no serà instaŀlat"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "S'instaŀlaran els paquets NOUS següents:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Es SUPRIMIRAN els paquets següents:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els paquets següents:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els paquets següents:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els paquets següents:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Es canviaran els paquets retinguts següents:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1450,27 +1453,27 @@ msgstr ""
"AVÍS: Es suprimiran els paquets essencials següents.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstaŀlats, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a suprimir i %lu no actualitzats.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instaŀlats o suprimits completament.\n"
@@ -1479,7 +1482,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1487,21 +1490,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -1559,7 +1562,7 @@ msgstr "Fet"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1575,12 +1578,12 @@ msgstr ""
" Tingueu en ment que el bloqueig està desactivat,\n"
" per tant, no es depèn de la situació actual real."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "No s'ha pogut canviar el nom de %s a %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1626,8 +1629,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1665,24 +1668,6 @@ msgstr "No es pot llegir el fitxer rèplica «%s»"
msgid "[Mirror: %s]"
msgstr "[Rèplica: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació "
-"del fitxer - el pedaç sembla ser incorrecte"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error "
-"específic del mmap) - el pedaç sembla ser incorrecte"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "No s'ha pogut crear el conducte IPC al subprocés"
@@ -2743,79 +2728,89 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3048,7 +3043,7 @@ msgstr "La mida no concorda"
msgid "Invalid file format"
msgstr "Operació no vàlida %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3057,16 +3052,16 @@ msgstr ""
"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
"al sources.list o fitxer malformat)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3075,12 +3070,12 @@ msgstr ""
"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
"actualitzacions per a aquest dipòsit no s'aplicaran."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3091,12 +3086,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,12 +3101,12 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "No es troba una font per baixar la versió «%s» de «%s»"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3540,6 +3535,20 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la "
+#~ "operació del fitxer - el pedaç sembla ser incorrecte"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error "
+#~ "específic del mmap) - el pedaç sembla ser incorrecte"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota: s'està seleccionant «%s» per a la tasca «%s»\n"
diff --git a/po/cs.po b/po/cs.po
index c4f634ac0..941306b86 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -99,7 +99,7 @@ msgstr "Soubor balíku %s je špatně synchronizovaný."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nebyly nalezeny žádné balíky"
@@ -706,13 +706,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -749,11 +752,11 @@ msgid "File not found"
msgstr "Soubor nebyl nalezen"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Nelze nastavit čas modifikace"
@@ -828,9 +831,9 @@ msgstr "Odpověď přeplnila buffer."
msgid "Protocol corruption"
msgstr "Porušení protokolu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Chyba zápisu"
@@ -1086,7 +1089,7 @@ msgstr "Spojení selhalo"
msgid "Internal error"
msgstr "Vnitřní chyba"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1336,101 +1339,101 @@ msgstr "Instalovat tyto balíky bez ověření?"
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Následující balíky mají nesplněné závislosti:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " nebo"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÁNY:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1438,27 +1441,27 @@ msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu přeinstalováno, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
@@ -1467,7 +1470,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1475,21 +1478,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -1547,7 +1550,7 @@ msgstr "Hotovo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1563,12 +1566,12 @@ msgstr ""
" Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
" tyto výsledky nemusí mít s realitou nic společného!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Selhalo přejmenování %s na %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1614,8 +1617,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1653,24 +1656,6 @@ msgstr "Nelze číst soubor se zrcadly „%s“"
msgid "[Mirror: %s]"
msgstr "[Zrcadlo: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je "
-"záplata porušená."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap "
-"nebyla zaznamenána) - zdá se, že je záplata porušená."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Selhalo vytvoření meziprocesové roury k podprocesu"
@@ -2717,76 +2702,86 @@ msgstr "Nelze zpracovat soubor %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3007,7 +3002,7 @@ msgstr "Velikosti nesouhlasí"
msgid "Invalid file format"
msgstr "Neplatná operace %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3016,16 +3011,16 @@ msgstr ""
"V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list "
"nebo porušený soubor)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "V souboru Release nelze najít kontrolní součet „%s“"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3034,12 +3029,12 @@ msgstr ""
"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
"repositáře se nepoužijí."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3049,12 +3044,12 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3063,12 +3058,12 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento "
"balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3483,6 +3478,20 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je "
+#~ "záplata porušená."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap "
+#~ "nebyla zaznamenána) - zdá se, že je záplata porušená."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Pozn: vybírám „%s“ pro úlohu „%s“\n"
diff --git a/po/cy.po b/po/cy.po
index d2456f053..1d924b05e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -113,7 +113,7 @@ msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
@@ -712,13 +712,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -759,11 +762,11 @@ msgid "File not found"
msgstr "Ffeil heb ei ganfod"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -839,9 +842,9 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -1105,7 +1108,7 @@ msgstr "Methodd y cysylltiad"
msgid "Internal error"
msgstr "Gwall mewnol"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1350,104 +1353,104 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1457,27 +1460,27 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
@@ -1486,7 +1489,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1494,21 +1497,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -1567,7 +1570,7 @@ msgstr "Wedi Gorffen"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1579,12 +1582,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Methwyd ailenwi %s at %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1630,8 +1633,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1669,20 +1672,6 @@ msgstr "Methwyd agor ffeil %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Methwyd creu pibell cyfathrebu at isbroses"
@@ -2760,81 +2749,91 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3066,7 +3065,7 @@ msgstr "Camgyfatebiaeth maint"
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3074,28 +3073,28 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3103,13 +3102,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,12 +3117,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/da.po b/po/da.po
index fad5ec57f..cd2a76ef6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2013-12-14 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -102,7 +102,7 @@ msgstr "Pakkefilen %s er ude af trit."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Fandt ingen pakker"
@@ -716,17 +716,21 @@ msgstr ""
"Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
#: cmdline/apt.cc:71
+#, fuzzy
msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -776,11 +780,11 @@ msgid "File not found"
msgstr "Fil blev ikke fundet"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -855,9 +859,9 @@ msgstr "Mellemlageret blev overfyldt af et svar."
msgid "Protocol corruption"
msgstr "Protokolfejl"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivefejl"
@@ -1119,7 +1123,7 @@ msgid "Internal error"
msgstr "Intern fejl"
# måske visning, kategorisering
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr "Listing"
@@ -1365,98 +1369,98 @@ msgstr "Installér disse pakker uden verifikation?"
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr "installeret,kan opgraderes til: "
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
msgid "[installed,local]"
msgstr "[Installeret,lokalt]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr "[installeret,kan auto-fjernes]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
msgid "[installed,automatic]"
msgstr "[Installeret,automatisk]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
msgid "[installed]"
msgstr "[Installeret]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr "[kan opgraderes fra: "
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr "[residual-konfig]"
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uopfyldte afhængigheder:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil blive installeret:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil blive AFINSTALLERET:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er blevet holdt tilbage:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil blive opgraderet:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil blive NEDGRADERET:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1464,27 +1468,27 @@ msgstr ""
"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
@@ -1493,7 +1497,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1501,21 +1505,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -1572,7 +1576,7 @@ msgstr "Færdig"
msgid "Full Text Search"
msgstr "Fuldtekst-søgning"
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr "ikke en reel pakke (virtuel)"
@@ -1588,12 +1592,12 @@ msgstr ""
" Husk også at låsning er deaktiveret,\n"
" så stol ikke på relevansen for den reelle aktuelle situation!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Kunne ikke fortolke %s. Rediger igen? "
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
@@ -1639,8 +1643,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1678,24 +1682,6 @@ msgstr "Ingen post fundet i spejlfil »%s«"
msgid "[Mirror: %s]"
msgstr "[Spejl: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - "
-"fejlrettelsen ser ud til at være ødelagt."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - "
-"fejlrettelsen ser ud til at være ødelagt."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Kunne ikke oprette IPC-videreførsel til underproces"
@@ -2749,76 +2735,86 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Åbner %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3042,7 +3038,7 @@ msgstr "Størrelsen stemmer ikke"
msgid "Invalid file format"
msgstr "Ugyldigt filformat"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3051,17 +3047,17 @@ msgstr ""
"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
"punkt eller forkert udformet fil)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3070,12 +3066,12 @@ msgstr ""
"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
"arkiv vil ikke blive anvendt."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3085,12 +3081,12 @@ msgstr ""
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3099,12 +3095,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3516,3 +3512,17 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr "Ikke låst"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - "
+#~ "fejlrettelsen ser ud til at være ødelagt."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - "
+#~ "fejlrettelsen ser ud til at være ødelagt."
diff --git a/po/de.po b/po/de.po
index 858ef4faa..10bca6f83 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -102,7 +102,7 @@ msgstr "Paketdatei %s ist nicht synchronisiert."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Keine Pakete gefunden"
@@ -741,13 +741,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -787,11 +790,11 @@ msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Abfrage mit »stat« fehlgeschlagen"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
@@ -866,9 +869,9 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
msgid "Protocol corruption"
msgstr "Protokoll beschädigt"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Schreibfehler"
@@ -1138,7 +1141,7 @@ msgstr "Verbindung fehlgeschlagen"
msgid "Internal error"
msgstr "Interner Fehler"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1391,102 +1394,102 @@ msgstr "Diese Pakete ohne Überprüfung installieren?"
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " oder"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr ""
"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1494,27 +1497,27 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu durch eine ältere Version ersetzt, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
@@ -1523,7 +1526,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1531,21 +1534,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -1603,7 +1606,7 @@ msgstr "Fertig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1620,12 +1623,12 @@ msgstr ""
" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n"
" Status der Sperre nicht darauf!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s konnte nicht in %s umbenannt werden."
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1671,8 +1674,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1710,24 +1713,6 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
msgid "[Mirror: %s]"
msgstr "[Spiegelserver: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s "
-"angewendet werden - der Patch scheint beschädigt zu sein."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts "
-"mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2803,77 +2788,87 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
msgid "Unable to parse package file %s (2)"
msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet."
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u in Quellliste %s zu lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3114,7 +3109,7 @@ msgstr "Größe stimmt nicht überein"
msgid "Invalid file format"
msgstr "Ungültige Operation %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3123,17 +3118,17 @@ msgstr ""
"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
"(falscher Eintrag in sources.list oder missgebildete Datei)."
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden."
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3142,12 +3137,12 @@ msgstr ""
"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
"dieses Depot werden nicht angewendet."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3158,12 +3153,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3173,14 +3168,14 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« "
"herunterzuladen."
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3612,6 +3607,21 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf "
+#~ "%s angewendet werden - der Patch scheint beschädigt zu sein."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch "
+#~ "nichts mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt "
+#~ "zu sein."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Hinweis: »%s« wird für Task »%s« gewählt.\n"
diff --git a/po/dz.po b/po/dz.po
index f32a8809e..fcd13c1a3 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -104,7 +104,7 @@ msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
@@ -690,13 +690,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -734,11 +737,11 @@ msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -813,9 +816,9 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས
msgid "Protocol corruption"
msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "འཛོལ་བ་འབྲི།"
@@ -1074,7 +1077,7 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1317,101 +1320,101 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "ཡང་ན།"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s( %s་གིས་སྦེ)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1419,27 +1422,27 @@ msgstr ""
"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
@@ -1448,7 +1451,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1456,21 +1459,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "ཝའི།"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -1528,7 +1531,7 @@ msgstr "འབད་ཚར་ཡི།"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1540,12 +1543,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1591,8 +1594,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1630,20 +1633,6 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -2704,76 +2693,86 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་
msgid "Unable to parse package file %s (2)"
msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2995,35 +2994,35 @@ msgstr "ཚད་མ་མཐུན།"
msgid "Invalid file format"
msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3031,12 +3030,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3045,12 +3044,12 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/el.po b/po/el.po
index 7d2685f38..4ad135c9c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -110,7 +110,7 @@ msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμέ
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Δε βρέθηκαν πακέτα"
@@ -702,13 +702,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -745,11 +748,11 @@ msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Αποτυχία εύρεσης της κατάστασης"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -824,9 +827,9 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν
msgid "Protocol corruption"
msgstr "Αλλοίωση του πρωτοκόλλου"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Σφάλμα εγγραφής"
@@ -1088,7 +1091,7 @@ msgstr "Η σύνδεση απέτυχε"
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1335,101 +1338,101 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "αλλά το %s είναι εγκατεστημένο"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκαταστάσημο"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "αλλά είναι ένα εικονικό πακέτο"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " η"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1437,27 +1440,27 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
@@ -1466,7 +1469,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Ν/ο]"
@@ -1474,21 +1477,21 @@ msgstr "[Ν/ο]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[ν/Ο]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -1548,7 +1551,7 @@ msgstr "Ετοιμο"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1560,12 +1563,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Αποτυχία μετονομασίας του %s σε %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1611,8 +1614,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1650,20 +1653,6 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία"
@@ -2727,76 +2716,86 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
msgid "Unable to parse package file %s (2)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3024,35 +3023,35 @@ msgstr "Ανόμοιο μέγεθος"
msgid "Invalid file format"
msgstr "Μη έγκυρη λειτουργία %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3060,12 +3059,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3074,12 +3073,12 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/es.po b/po/es.po
index 98cae4093..7ae80ff02 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgstr "El archivo de paquetes %s está desincronizado."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "No se encontró ningún paquete"
@@ -762,13 +762,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -805,11 +808,11 @@ msgid "File not found"
msgstr "Fichero no encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificación"
@@ -884,9 +887,9 @@ msgstr "No pude crear un socket."
msgid "Protocol corruption"
msgstr "Fallo del protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Error de escritura"
@@ -1145,7 +1148,7 @@ msgstr "Fallo la conexión"
msgid "Internal error"
msgstr "Error interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1399,101 +1402,101 @@ msgstr "¿Instalar estos paquetes sin verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "pero %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s va a ser instalado"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "pero no está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARÁN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Se actualizarán los siguientes paquetes:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Se cambiarán los siguientes paquetes retenidos:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1501,27 +1504,27 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarán, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
@@ -1530,7 +1533,7 @@ msgstr "%lu no instalados del todo o eliminados.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1538,21 +1541,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
@@ -1610,7 +1613,7 @@ msgstr "Listo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1626,12 +1629,12 @@ msgstr ""
" Tenga también en cuenta que se han desactivado los bloqueos,\n"
" ¡no dependa de la relevancia a la situación real actual!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "No pude abrir %s.new"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1677,8 +1680,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1716,24 +1719,6 @@ msgstr "No se encontró un archivo de réplica «%s»"
msgid "[Mirror: %s]"
msgstr "[Réplica: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"No se pudo parchear %s con mmap y con el modo de uso de la operación de "
-"ficheros - el paquete parece dañado."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - el "
-"parche parece dañado."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falló la creación de una tubería IPC para el subproceso"
@@ -2803,82 +2788,92 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
"asociado un valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Línea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3109,37 +3104,37 @@ msgstr "El tamaño difiere"
msgid "Invalid file format"
msgstr "Operación inválida: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3150,12 +3145,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3165,12 +3160,12 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3601,6 +3596,20 @@ msgstr ""
msgid "Not locked"
msgstr "No bloqueado"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No se pudo parchear %s con mmap y con el modo de uso de la operación de "
+#~ "ficheros - el paquete parece dañado."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - "
+#~ "el parche parece dañado."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, seleccionando «%s» para la tarea «%s»\n"
diff --git a/po/eu.po b/po/eu.po
index 743367e45..b07f1a948 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -101,7 +101,7 @@ msgstr "%s pakete fitxategia ez dago sinkronizatuta."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Ez da paketerik aurkitu"
@@ -689,13 +689,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -733,11 +736,11 @@ msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -814,9 +817,9 @@ msgstr "Erantzun batek bufferrari gainez eragin dio."
msgid "Protocol corruption"
msgstr "Protokolo hondatzea"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Idazketa errorea"
@@ -1075,7 +1078,7 @@ msgstr "Konexioak huts egin du"
msgid "Internal error"
msgstr "Barne errorea"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1325,101 +1328,101 @@ msgstr "Paketeak egiaztapen gabe instalatu?"
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " edo"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1427,27 +1430,27 @@ msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez erabat instalatuta edo kenduta.\n"
@@ -1456,7 +1459,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[B/e]"
@@ -1464,21 +1467,21 @@ msgstr "[B/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[b/E]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -1536,7 +1539,7 @@ msgstr "Eginda"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1548,12 +1551,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1599,8 +1602,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1638,20 +1641,6 @@ msgstr "%s fitxategia ezin izan da ireki"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean"
@@ -2706,76 +2695,86 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s pakete fitxategia analizatu (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2993,35 +2992,35 @@ msgstr "Tamaina ez dator bat"
msgid "Invalid file format"
msgstr "Eragiketa baliogabea: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3029,12 +3028,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3043,12 +3042,12 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/fi.po b/po/fi.po
index 5fceb73ef..958fc756c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -101,7 +101,7 @@ msgstr "Pakettitiedosto %s ei ole ajan tasalla."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Yhtään pakettia ei löytynyt"
@@ -684,13 +684,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -727,11 +730,11 @@ msgid "File not found"
msgstr "Tiedostoa ei löydy"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -806,9 +809,9 @@ msgstr "Vastaus aiheutti puskurin ylivuodon."
msgid "Protocol corruption"
msgstr "Yhteyskäytäntö on turmeltunut"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Virhe kirjoitettaessa"
@@ -1067,7 +1070,7 @@ msgstr "Yhteys ei toiminut"
msgid "Internal error"
msgstr "Sisäinen virhe"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1317,101 +1320,101 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?"
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " tai"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1419,27 +1422,27 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
@@ -1448,7 +1451,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[K/e]"
@@ -1456,21 +1459,21 @@ msgstr "[K/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "K"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -1528,7 +1531,7 @@ msgstr "Valmis"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1540,12 +1543,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1591,8 +1594,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1630,20 +1633,6 @@ msgstr "Tiedostoa %s ei voitu avata"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "IPC-putken luominen aliprosessiin ei onnistunut"
@@ -2697,76 +2686,86 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2984,35 +2983,35 @@ msgstr "Koko ei täsmää"
msgid "Invalid file format"
msgstr "Virheellinen toiminto %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3020,12 +3019,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,12 +3033,12 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/fr.po b/po/fr.po
index 2c7f2114d..64ce07802 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2013-08-17 07:57+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -101,7 +101,7 @@ msgstr "Fichier %s désynchronisé."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Aucun paquet n'a été trouvé"
@@ -745,13 +745,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -790,11 +793,11 @@ msgid "File not found"
msgstr "Fichier non trouvé"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -870,9 +873,9 @@ msgstr "Une réponse a fait déborder le tampon."
msgid "Protocol corruption"
msgstr "Corruption du protocole"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Erreur d'écriture"
@@ -1137,7 +1140,7 @@ msgstr "Échec de la connexion"
msgid "Internal error"
msgstr "Erreur interne"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1399,101 +1402,101 @@ msgstr "Faut-il installer ces paquets sans vérification ?"
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mais %s est installé"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra être installé"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mais il n'est pas installé"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mais ne sera pas installé"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installés :"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVÉS :"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont été conservés :"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis à jour :"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changés :"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1502,27 +1505,27 @@ msgstr ""
"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
"que vous êtes en train de faire."
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis à jour, %lu nouvellement installés, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu réinstallés, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis à une version inférieure, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu à enlever et %lu non mis à jour.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installés ou enlevés.\n"
@@ -1531,7 +1534,7 @@ msgstr "%lu partiellement installés ou enlevés.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[O/n]"
@@ -1539,21 +1542,21 @@ msgstr "[O/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[o/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -1611,7 +1614,7 @@ msgstr "Fait"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1629,12 +1632,12 @@ msgstr ""
" et la situation n'est donc pas forcément représentative\n"
" de la réalité !"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Impossible de changer le nom %s en %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1680,8 +1683,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1719,24 +1722,6 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »."
msgid "[Mirror: %s]"
msgstr "[Miroir : %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossible de modifier %s avec mmap et l'utilisation des opérations de "
-"fichiers : le correctif semble être corrompu."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
-"correctif semble être corrompu."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Impossible de créer le tube IPC sur le sous-processus"
@@ -2810,87 +2795,98 @@ 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:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
"[option])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
"affectation)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
"valeur)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, 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:134
+#: apt-pkg/sourcelist.cc:182
#, 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:137
+#: apt-pkg/sourcelist.cc:185
#, 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:143
+#: apt-pkg/sourcelist.cc:191
#, 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:150
+#: apt-pkg/sourcelist.cc:198
#, 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:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Ouverture de %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, 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:289
+#: apt-pkg/sourcelist.cc:345
#, 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:293
+#: apt-pkg/sourcelist.cc:349
#, 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:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3134,7 +3130,7 @@ msgstr "Taille incohérente"
msgid "Invalid file format"
msgstr "L'opération %s n'est pas valable"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3143,18 +3139,18 @@ msgstr ""
"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
" ligne non valable dans sources.list ou fichier corrompu"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3163,12 +3159,12 @@ msgstr ""
"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
"à jour depuis ce dépôt ne s'effectueront pas."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3179,12 +3175,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3193,14 +3189,14 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossible de trouver une source de téléchargement de la version « %s » de "
"« %s »"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3630,6 +3626,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
+#~ 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."
+
+#~ 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."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Note : sélection de %s pour la tâche « %s »\n"
diff --git a/po/gl.po b/po/gl.po
index 594340651..57343335a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -104,7 +104,7 @@ msgstr "O ficheiro de paquete %s está sen sincronizar."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Non se atopou ningún paquete"
@@ -707,13 +707,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -750,11 +753,11 @@ msgid "File not found"
msgstr "Non se atopou o ficheiro"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Non foi posíbel determinar o estado"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Non foi posíbel estabelecer a hora de modificación"
@@ -829,9 +832,9 @@ msgstr "Unha resposta desbordou o búfer."
msgid "Protocol corruption"
msgstr "Dano no protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Produciuse un erro de escritura"
@@ -1094,7 +1097,7 @@ msgstr "Produciuse un fallo na conexión"
msgid "Internal error"
msgstr "Produciuse un erro interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1349,101 +1352,101 @@ msgstr "Instalar estes paquetes sen verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mais %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mais vaise instalar %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mais non é instalábel"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mais é un paquete virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mais non está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mais non se vai a instalar"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Vanse RETIRAR os paquetes seguintes:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Consérvanse os seguintes paquetes:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Vanse anovar os paquetes seguintes:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Vanse REVERTER os seguintes paquetes :"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Vanse modificar os paquetes retidos seguintes:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por mor de %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1451,27 +1454,27 @@ msgstr ""
"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu anovados, %lu instalados, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non instalados ou retirados de todo.\n"
@@ -1480,7 +1483,7 @@ msgstr "%lu non instalados ou retirados de todo.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1488,21 +1491,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Produciuse un erro na compilación da expresión regular - %s"
@@ -1560,7 +1563,7 @@ msgstr "Feito"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1577,12 +1580,12 @@ msgstr ""
" Lembre tamén que o bloqueo está desactivado,\n"
" polo que non debe depender da relevancia da situación actual real."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Non foi posíbel cambiar o nome de %s a %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1628,8 +1631,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1667,24 +1670,6 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
msgid "[Mirror: %s]"
msgstr "[Replica: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - a "
-"actualización semella estar danada."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Non foi posíbel actualizar %s con mmap e (mais non hai un fallo específico "
-"de mmap) - a actualización semella estar danada."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Non foi posíbel crear a canle IPC ao subproceso"
@@ -2750,80 +2735,90 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Liña %u longa de máis na lista de orixes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3050,7 +3045,7 @@ msgstr "Os tamaños non coinciden"
msgid "Invalid file format"
msgstr "Operación incorrecta: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3059,29 +3054,29 @@ msgstr ""
"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3092,12 +3087,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,12 +3101,12 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3544,6 +3539,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - "
+#~ "a actualización semella estar danada."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Non foi posíbel actualizar %s con mmap e (mais non hai un fallo "
+#~ "específico de mmap) - a actualización semella estar danada."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, seleccione «%s» para a tarefa «%s»\n"
diff --git a/po/hu.po b/po/hu.po
index d91bd407e..a70700de7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -103,7 +103,7 @@ msgstr "%s csomagfájl nincs szinkronban."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nem találhatók csomagok"
@@ -722,13 +722,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -766,11 +769,11 @@ msgid "File not found"
msgstr "A fájl nem található"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "A módosítási idő beállítása sikertelen"
@@ -847,9 +850,9 @@ msgstr "A válasz túlcsordította a puffert."
msgid "Protocol corruption"
msgstr "Protokollhiba"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Írási hiba"
@@ -1107,7 +1110,7 @@ msgstr "Sikertelen kapcsolódás"
msgid "Internal error"
msgstr "Belső hiba"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1354,101 +1357,101 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "de az nincs telepítésre megjelölve"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " vagy"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Az alábbi csomagok vissza lesznek tartva:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Az alábbi csomagok frissítve lesznek:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Az alábbi visszafogott csomagokat cserélem:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1456,27 +1459,27 @@ msgstr ""
"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu frissített, %lu újonnan telepített, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu újratelepítendő, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu visszafejlesztendő, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
@@ -1485,7 +1488,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[I/n]"
@@ -1493,21 +1496,21 @@ msgstr "[I/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[i/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -1565,7 +1568,7 @@ msgstr "Kész"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1581,12 +1584,12 @@ msgstr ""
" Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
" így ne számítson a jelenlegi helyzet valósságára!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "„%s” átnevezése sikertelen erre: %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1632,8 +1635,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1671,24 +1674,6 @@ msgstr "A(z) „%s” tükörfájl nem olvasható"
msgid "[Mirror: %s]"
msgstr "[Tükör: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek "
-"tűnik."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek "
-"tűnik."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz"
@@ -2750,86 +2735,96 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
"feldolgozhatatlan)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
"rövid)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
"érvényes hozzárendelés)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
"tartalmaz kulcsot)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
"nincs értéke)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s megnyitása"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3057,7 +3052,7 @@ msgstr "A méret nem megfelelő"
msgid "Invalid file format"
msgstr "%s érvénytelen művelet"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3066,16 +3061,16 @@ msgstr ""
"A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list "
"bejegyzés vagy helytelenül formázott fájl)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3084,12 +3079,12 @@ msgstr ""
"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
"frissítései nem kerülnek alkalmazásra."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3099,12 +3094,12 @@ msgstr ""
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3113,12 +3108,12 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3538,6 +3533,20 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek "
+#~ "tűnik."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek "
+#~ "tűnik."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Megjegyzés: „%s” kijelölése „%s” feladathoz\n"
diff --git a/po/it.po b/po/it.po
index d7f8a8a24..6f0d90f13 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2013-08-27 22:06+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -102,7 +102,7 @@ msgstr "Il file dei pacchetti %s non è sincronizzato."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nessun pacchetto trovato"
@@ -736,13 +736,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -779,11 +782,11 @@ msgid "File not found"
msgstr "File non trovato"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
@@ -859,9 +862,9 @@ msgstr "Una risposta ha superato le dimensioni del buffer."
msgid "Protocol corruption"
msgstr "Protocollo danneggiato"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Errore di scrittura"
@@ -1125,7 +1128,7 @@ msgstr "Connessione non riuscita"
msgid "Internal error"
msgstr "Errore interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1382,101 +1385,101 @@ msgstr "Installare questi pacchetti senza verificarli?"
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ma la versione %s è installata"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ma la versione %s sta per essere installata"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ma non è installabile"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ma è un pacchetto virtuale"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ma non è installato"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ma non sta per essere installato"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " oppure"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI saranno installati:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1485,27 +1488,27 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo."
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
@@ -1514,7 +1517,7 @@ msgstr "%lu non completamente installati o rimossi.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1522,21 +1525,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -1594,7 +1597,7 @@ msgstr "Eseguito"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1610,12 +1613,12 @@ msgstr ""
" Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
" utile dare importanza a tutto ciò per una situazione reale."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Rinomina di %s in %s non riuscita"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1662,8 +1665,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1701,24 +1704,6 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\""
msgid "[Mirror: %s]"
msgstr "[Mirror: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossibile applicare la patch a %s con mmap e con l'utilizzo di operazioni "
-"file. La patch sembra essere danneggiata."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossibile applicare la patch a %s con mmap (nessun errore da parte di "
-"mmap). La patch sembra essere danneggiata."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
@@ -2792,86 +2777,96 @@ 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:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
"analizzabile)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
"corta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
"un'assegnazione)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
"chiave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
"ha un valore)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, 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:134
+#: apt-pkg/sourcelist.cc:182
#, 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:137
+#: apt-pkg/sourcelist.cc:185
#, 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:143
+#: apt-pkg/sourcelist.cc:191
#, 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:150
+#: apt-pkg/sourcelist.cc:198
#, 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:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riga %u troppo lunga nel file %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, 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:293
+#: apt-pkg/sourcelist.cc:349
#, 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:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3107,7 +3102,7 @@ msgstr "Le dimensioni non corrispondono"
msgid "Invalid file format"
msgstr "Operazione %s non valida"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3116,17 +3111,17 @@ msgstr ""
"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
"errata o file danneggiato)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3135,12 +3130,12 @@ msgstr ""
"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
"questo repository non verranno applicati."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3150,12 +3145,12 @@ msgstr ""
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3164,14 +3159,14 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3605,6 +3600,20 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
+#~ 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."
+
+#~ 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."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n"
diff --git a/po/ja.po b/po/ja.po
index 0b495027e..3ef58b94c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.9.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2013-08-11 19:39+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -100,7 +100,7 @@ msgstr "Package ファイル %s が同期していません。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "パッケージが見つかりません"
@@ -726,13 +726,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -769,11 +772,11 @@ msgid "File not found"
msgstr "ファイルが見つかりません"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "状態の取得に失敗しました"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "変更時刻の設定に失敗しました"
@@ -848,9 +851,9 @@ msgstr "レスポンスがバッファをオーバフローさせました。"
msgid "Protocol corruption"
msgstr "プロトコルが壊れています"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "書き込みエラー"
@@ -1108,7 +1111,7 @@ msgstr "接続失敗"
msgid "Internal error"
msgstr "内部エラー"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1351,101 +1354,101 @@ msgstr "検証なしにこれらのパッケージをインストールします
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [インストール済み]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [インストール済み]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [インストール済み]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "以下のパッケージには満たせない依存関係があります:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "しかし、%s はインストールされています"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "しかし、%s はインストールされようとしています"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "しかし、インストールすることができません"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "しかし、これは仮想パッケージです"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "しかし、インストールされていません"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "しかし、インストールされようとしていません"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " または"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "以下のパッケージが新たにインストールされます:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "以下のパッケージは「削除」されます:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "以下のパッケージは保留されます:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "以下のパッケージはアップグレードされます:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "以下のパッケージは「ダウングレード」されます:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "以下の変更禁止パッケージは変更されます:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s のため) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1453,27 +1456,27 @@ msgstr ""
"警告: 以下の不可欠パッケージが削除されます。\n"
"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "再インストール: %lu 個、"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "ダウングレード: %lu 個、"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "削除: %lu 個、保留: %lu 個。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
@@ -1482,7 +1485,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1490,21 +1493,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -1564,7 +1567,7 @@ msgstr "完了"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1580,12 +1583,12 @@ msgstr ""
" ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
" あるとは言い切れないことに注意してください!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s を %s に名前変更できませんでした"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1631,8 +1634,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1670,24 +1673,6 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません"
msgid "[Mirror: %s]"
msgstr "[ミラー: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れてい"
-"るようです。"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありません) - "
-"パッチが壊れているようです。"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "子プロセスへの IPC パイプの作成に失敗しました"
@@ -2739,80 +2724,90 @@ msgstr "パッケージファイル %s を解釈することができません (
msgid "Unable to parse package file %s (2)"
msgstr "パッケージファイル %s を解釈することができません (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s をオープンしています"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3042,7 +3037,7 @@ msgstr "サイズが適合しません"
msgid "Invalid file format"
msgstr "不正な操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3051,16 +3046,16 @@ msgstr ""
"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
"sources.list エントリか、壊れたファイル)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3069,14 +3064,14 @@ msgstr ""
"%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
"物は適用されません。"
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3086,12 +3081,12 @@ msgstr ""
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,12 +3095,12 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3530,6 +3525,20 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れて"
+#~ "いるようです。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありませ"
+#~ "ん) - パッチが壊れているようです。"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n"
diff --git a/po/km.po b/po/km.po
index 9729de5c1..e0944fa9f 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -105,7 +105,7 @@ msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "រក​កញ្ចប់​មិន​ឃើញ"
@@ -682,13 +682,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -725,11 +728,11 @@ msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "បរាជ័យ​ក្នុងការថ្លែង"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
@@ -803,9 +806,9 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន
msgid "Protocol corruption"
msgstr "ការបង្ខូច​ពិធីការ​"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "ការសរសេរ​មានកំហុស"
@@ -1060,7 +1063,7 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1299,101 +1302,101 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ឬ"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ដោយ​សារតែ​ %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1401,27 +1404,27 @@ msgstr ""
"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
@@ -1430,7 +1433,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1438,21 +1441,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -1510,7 +1513,7 @@ msgstr "ធ្វើរួច​"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1522,12 +1525,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1573,8 +1576,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1612,20 +1615,6 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
@@ -2676,76 +2665,86 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "កំពុង​បើក​ %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2963,35 +2962,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
msgid "Invalid file format"
msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2999,12 +2998,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3013,12 +3012,12 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/ko.po b/po/ko.po
index d6968b85f..f768cb179 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -97,7 +97,7 @@ msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "패키지가 없습니다"
@@ -689,13 +689,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -732,11 +735,11 @@ msgid "File not found"
msgstr "파일이 없습니다"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "파일 정보를 읽는데 실패했습니다"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "파일 변경 시각을 설정하는데 실패했습니다"
@@ -811,9 +814,9 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다."
msgid "Protocol corruption"
msgstr "프로토콜이 틀렸습니다"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "쓰기 오류"
@@ -1068,7 +1071,7 @@ msgstr "연결이 실패했습니다"
msgid "Internal error"
msgstr "내부 오류"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1310,101 +1313,101 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는데 실패했습니다 %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "하지만 %s 패키지를 설치했습니다"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "하지만 %s 패키지를 설치할 것입니다"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "하지만 설치할 수 없습니다"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "하지만 가상 패키지입니다"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "하지만 설치하지 않았습니다"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " 혹은"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "다음 새 패키지를 설치할 것입니다:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "다음 패키지를 지울 것입니다:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "다음 패키지를 업그레이드할 것입니다:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "다음 패키지를 다운그레이드할 것입니다:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s때문에) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1412,27 +1415,27 @@ msgstr ""
"경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu개 업그레이드, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
@@ -1441,7 +1444,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1449,21 +1452,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -1522,7 +1525,7 @@ msgstr "완료"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1538,12 +1541,12 @@ msgstr ""
" 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
" 않도록 하십시오!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1589,8 +1592,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1628,24 +1631,6 @@ msgstr "'%s' 미러 파일이 없습니다 "
msgid "[Mirror: %s]"
msgstr "[미러 사이트: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상된 것"
-"처럼 보입니다."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 파일"
-"이 손상된 것처럼 보입니다."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다"
@@ -2696,77 +2681,87 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
msgid "Unable to parse package file %s (2)"
msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s 파일을 여는 중입니다"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2986,35 +2981,35 @@ msgstr "크기가 맞지 않습니다"
msgid "Invalid file format"
msgstr "잘못된 작업 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3024,12 +3019,12 @@ msgstr ""
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3038,12 +3033,12 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3454,6 +3449,20 @@ msgstr ""
msgid "Not locked"
msgstr "잠기지 않음"
+#~ 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 관련 실패는 없음) 적용할 수 없습니다. 패치 "
+#~ "파일이 손상된 것처럼 보입니다."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "주의, 작업 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n"
diff --git a/po/ku.po b/po/ku.po
index 7777615c3..fc762aff0 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -104,7 +104,7 @@ msgstr "Pakêta dosya %s li derveyî demê ye."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Pakêt nayên dîtin"
@@ -604,13 +604,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -645,12 +648,12 @@ msgid "File not found"
msgstr "Pel nehate dîtin"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr ""
@@ -723,9 +726,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Çewtiya nivîsînê"
@@ -982,7 +985,7 @@ msgstr "Girêdan pêk nehatiye"
msgid "Internal error"
msgstr "Çewtiya hundirîn"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1208,127 +1211,127 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "lê %s sazkirî ye"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "lê %s dê were sazkirin"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "lê sazkirina wê ne gengaz e"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "lê paketeke farazî ye"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "lê ne sazkirî ye"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "lê dê neyê sazkirin"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " û"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Ev pakêt dê werine RAKIRIN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr ""
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Ev paket dê werine bilindkirin:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ji ber %s)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ji nû ve sazkirî,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu hatine nizmkirin."
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1337,7 +1340,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
#, fuzzy
msgid "[Y/n]"
msgstr "[E/n]"
@@ -1346,21 +1349,21 @@ msgstr "[E/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1417,7 +1420,7 @@ msgstr "Temam"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1429,12 +1432,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s ji hev nehate veçirandin"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1477,8 +1480,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1516,20 +1519,6 @@ msgstr "Nikarî pelê %s veke"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -2519,76 +2508,86 @@ msgstr "Pakêt nehate dîtin %s"
msgid "Unable to parse package file %s (2)"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s tê vekirin"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:386
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2798,35 +2797,35 @@ msgstr "Mezinahî li hev nayên"
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2834,24 +2833,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/lt.po b/po/lt.po
index 12ec54dbc..46e7f2c13 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -103,7 +103,7 @@ msgstr ""
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Paketų nerasta"
@@ -608,13 +608,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -649,11 +652,11 @@ msgid "File not found"
msgstr "Failas nerastas"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr ""
@@ -726,9 +729,9 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Rašymo klaida"
@@ -982,7 +985,7 @@ msgstr "Prisijungti nepavyko"
msgid "Internal error"
msgstr "Vidinė klaida"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1220,101 +1223,101 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?"
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "bet %s yra įdiegtas"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "bet %s bus įdiegtas"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "tačiau jis negali būti įdiegtas"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "bet tai yra virtualus paketas"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "bet jis nėra įdiegtas"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "bet jis nebus įdiegtas"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " arba"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Bus įdiegti šie NAUJI paketai:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Bus PAŠALINTI šie paketai:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Šių paketų atnaujinimas sulaikomas:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Bus atnaujinti šie paketai:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Bus pakeisti šie sulaikyti paketai:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dėl %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1322,27 +1325,27 @@ msgstr ""
"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu įdiegti iš naujo, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu pasendinti, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
@@ -1351,7 +1354,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1359,21 +1362,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1432,7 +1435,7 @@ msgstr "Įvykdyta"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1444,12 +1447,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nepavyko pervadinti %s į %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1495,8 +1498,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1534,20 +1537,6 @@ msgstr "Nepavyko atverti failo %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nepavyko subprocesui sukurti IPC gijos"
@@ -2608,76 +2597,86 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Atveriama %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:386
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2890,35 +2889,35 @@ msgstr "Neatitinka dydžiai"
msgid "Invalid file format"
msgstr "Klaidingas veiksmas %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2926,24 +2925,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/mr.po b/po/mr.po
index ee2238550..f77866298 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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 "
@@ -99,7 +99,7 @@ msgstr "पॅकेज संचिका %s सिंक्रोनाइज
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "पॅकेजेस सापडले नाहीत"
@@ -678,13 +678,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -721,11 +724,11 @@ msgid "File not found"
msgstr "फाईल सापडली नाही"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "स्टॅट करण्यास असमर्थ"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
@@ -800,9 +803,9 @@ msgstr "प्रतिसाधाने बफर भरुन गेले."
msgid "Protocol corruption"
msgstr "प्रोटोकॉल खराब झाले"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "लिहिण्यात त्रुटी"
@@ -1058,7 +1061,7 @@ msgstr "जोडणी अयशस्वी"
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1303,101 +1306,101 @@ msgstr "पडताळून पाहिल्याशिवाय ही प
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "[संस्थापित केले]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "[संस्थापित केले]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "[संस्थापित केले]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "पण %s संस्थापित झाले"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "पण %s संस्थापित करायचे आहे"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "पण ते संस्थापित करण्याजोगे नाही"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "पण ते आभासी पॅकेज आहे"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "पण ते संस्थापित केले नाही"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "पण ते संस्थापित होणार नाही"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "किंवा"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (च्या मुळे %s)"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1405,27 +1408,27 @@ msgstr ""
"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पुनर्संस्थापित केले,"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu मागील आवृत्तीकृत केले,"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
@@ -1434,7 +1437,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1442,21 +1445,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "होय"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -1514,7 +1517,7 @@ msgstr "झाले"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1526,12 +1529,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1577,8 +1580,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1616,20 +1619,6 @@ msgstr "%s फाईल उघडता येत नाही"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ"
@@ -2680,76 +2669,86 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या
msgid "Unable to parse package file %s (2)"
msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s उघडत आहे"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2971,35 +2970,35 @@ msgstr "आकार जुळतनाही"
msgid "Invalid file format"
msgstr "%s अवैध क्रिया"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3007,12 +3006,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3021,12 +3020,12 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/nb.po b/po/nb.po
index 3cca09bb2..bdd00052d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ikke oppdatert."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Fant ingen pakker"
@@ -693,13 +693,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -738,11 +741,11 @@ msgid "File not found"
msgstr "Fant ikke fila"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -817,9 +820,9 @@ msgstr "Et svar oversvømte bufferen."
msgid "Protocol corruption"
msgstr "Protokollødeleggelse"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivefeil"
@@ -1076,7 +1079,7 @@ msgstr "Forbindelsen mislykkes"
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1324,101 +1327,101 @@ msgstr "Installer disse pakkene uten verifikasjon?"
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil bli installert:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil bli FJERNET:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er holdt tilbake:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil bli oppgradert:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil bli NEDGRADERT:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Følgende pakker vil bli endret:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1426,27 +1429,27 @@ msgstr ""
"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på nytt, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
@@ -1455,7 +1458,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1463,21 +1466,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -1535,7 +1538,7 @@ msgstr "Utført"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1551,12 +1554,12 @@ msgstr ""
" Husk også at låsing er deaktivert, så ikke regn med \n"
" relevans i forhold til den reelle gjeldende situasjonen."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Klarte ikke å endre navnet på %s til %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1602,8 +1605,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1641,24 +1644,6 @@ msgstr "Ingen speilfil «%s» funnet"
msgid "[Mirror: %s]"
msgstr "[Speil: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser "
-"ut til å være korrupt."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
-"programrettelsen ser ut til å være korrupt."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
@@ -2714,76 +2699,86 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarer ikke å fortolke pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Feil på linje %lu i kildelista %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Feil på %lu i kildelista %s (dist fortolking)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Åpner %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil på %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3004,36 +2999,36 @@ msgstr "Feil størrelse"
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3043,12 +3038,12 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3057,12 +3052,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3481,6 +3476,20 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen "
+#~ "ser ut til å være korrupt."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
+#~ "programrettelsen ser ut til å være korrupt."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Merk, velger «%s» for oppgaven «%s»\n"
diff --git a/po/ne.po b/po/ne.po
index 660924b79..3d9ecee00 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -102,7 +102,7 @@ msgstr "प्याकेज फाइल %s sync भन्दा बाहि
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "कुनै प्याकेजहरू फेला परेन"
@@ -680,13 +680,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -723,11 +726,11 @@ msgid "File not found"
msgstr "फाइल फेला परेन "
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "स्थिर गर्न असफल भयो"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "परिमार्जन समय सेट असफल भयो"
@@ -802,9 +805,9 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि
msgid "Protocol corruption"
msgstr "प्रोटोकल दूषित"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "त्रुटि लेख्नुहोस्"
@@ -1059,7 +1062,7 @@ msgstr "जडान असफल भयो"
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1300,101 +1303,101 @@ msgstr "यी प्याकेजहरू रूजू बिना स्
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [स्थापना भयो]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [स्थापना भयो]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [स्थापना भयो]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "तर %s स्थापना भयो"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "तर यो स्थापनायोग्य छैन"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "तर यो अवास्तविक प्याकेज होइन"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "तर यो स्थापना भएन"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "तर यो स्थापना हुन गइरहेको छैन"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "वा"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s कारणले) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1402,27 +1405,27 @@ msgstr ""
"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पुन: स्थापना गरियो, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu स्तर कम गरियो, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
@@ -1431,7 +1434,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1439,21 +1442,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -1511,7 +1514,7 @@ msgstr "काम भयो"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1523,12 +1526,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr " %s मा %s पुन:नामकरण असफल भयो"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1574,8 +1577,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1613,20 +1616,6 @@ msgstr "फाइल %s खोल्न सकिएन"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल"
@@ -2678,76 +2667,86 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न
msgid "Unable to parse package file %s (2)"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s खोलिदैछ"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2965,35 +2964,35 @@ msgstr "साइज मेल खाएन"
msgid "Invalid file format"
msgstr "अवैध सञ्चालन %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3001,12 +3000,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3015,12 +3014,12 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/nl.po b/po/nl.po
index 150c456e4..b9b9794ee 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -103,7 +103,7 @@ msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Geen pakketten gevonden"
@@ -705,13 +705,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -749,11 +752,11 @@ msgid "File not found"
msgstr "Bestand niet gevonden"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "stat is mislukt"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -828,9 +831,9 @@ msgstr "Een reactie deed de buffer overlopen"
msgid "Protocol corruption"
msgstr "Protocolcorruptie"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Schrijffout"
@@ -1093,7 +1096,7 @@ msgstr "Verbinding mislukt"
msgid "Internal error"
msgstr "Interne fout"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1344,101 +1347,101 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?"
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "maar %s is geïnstalleerd"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal geïnstalleerd worden"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "maar het is niet geïnstalleerd"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "maar het zal niet geïnstalleerd worden"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " of"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (vanwege %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1446,27 +1449,27 @@ msgstr ""
"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw geïnstalleerd, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
@@ -1475,7 +1478,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1483,21 +1486,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -1555,7 +1558,7 @@ msgstr "Klaar"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1571,12 +1574,12 @@ msgstr ""
" Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n"
" vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Hernoemen van %s naar %s is mislukt"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1622,8 +1625,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1661,24 +1664,6 @@ msgstr "Geen spiegelbestand '%s' gevonden "
msgid "[Mirror: %s]"
msgstr "[Spiegelserver: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt "
-"beschadigd te zijn."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de patch "
-"lijkt beschadigd te zijn."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Aanmaken van IPC-pijp naar subproces is mislukt"
@@ -2748,77 +2733,87 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3051,36 +3046,36 @@ msgstr "Grootte komt niet overeen"
msgid "Invalid file format"
msgstr "Ongeldige operatie %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3091,12 +3086,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3105,12 +3100,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3540,6 +3535,20 @@ msgstr ""
msgid "Not locked"
msgstr "Niet vergrendeld"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt "
+#~ "beschadigd te zijn."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de "
+#~ "patch lijkt beschadigd te zijn."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Let op, '%s' wordt geselecteerd omwille van de taak '%s'\n"
diff --git a/po/nn.po b/po/nn.po
index 6cb37a7a3..6ae106e38 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ute av takt."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Fann ingen pakkar"
@@ -687,13 +687,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -732,11 +735,11 @@ msgid "File not found"
msgstr "Fann ikkje fila"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Klarte ikkje f status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -811,9 +814,9 @@ msgstr "Eit svar flaumde over bufferen."
msgid "Protocol corruption"
msgstr "Protokollydeleggjing"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivefeil"
@@ -1068,7 +1071,7 @@ msgstr "Sambandet mislukkast"
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1309,101 +1312,101 @@ msgstr "Installer desse pakkane utan verifikasjon?"
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men lt seg ikkje installera"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Dei flgjande pakkane vil verta FJERNA:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Dei flgjande pakkane er haldne tilbake:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1412,27 +1415,27 @@ msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte p nytt, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
@@ -1441,7 +1444,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1449,21 +1452,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -1522,7 +1525,7 @@ msgstr "Ferdig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1534,12 +1537,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Klarte ikkje endra namnet p %s til %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1585,8 +1588,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1624,20 +1627,6 @@ msgstr "Klarte ikkje opna fila %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen"
@@ -2684,76 +2673,86 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2977,35 +2976,35 @@ msgstr "Feil storleik"
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3013,12 +3012,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3027,12 +3026,12 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/pl.po b/po/pl.po
index 7f42430fa..537f2b12c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -105,7 +105,7 @@ msgstr "Plik pakietu %s jest przestarzały."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nie znaleziono żadnych pakietów"
@@ -732,13 +732,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -775,11 +778,11 @@ msgid "File not found"
msgstr "Nie odnaleziono pliku"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -856,9 +859,9 @@ msgstr "Odpowiedź przepełniła bufor."
msgid "Protocol corruption"
msgstr "Naruszenie zasad protokołu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Błąd zapisu"
@@ -1117,7 +1120,7 @@ msgstr "Połączenie nie powiodło się"
msgid "Internal error"
msgstr "Błąd wewnętrzny"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1381,101 +1384,101 @@ msgstr "Zainstalować te pakiety bez weryfikacji?"
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Następujące pakiety mają niespełnione zależności:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zostać zainstalowany"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ale nie da się go zainstalować"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " lub"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Następujące pakiety zostaną USUNIĘTE:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Następujące pakiety zostały zatrzymane:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Następujące pakiety zostaną zaktualizowane:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1483,27 +1486,27 @@ msgstr ""
"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ponownie instalowanych, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofniętych wersji, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
@@ -1512,7 +1515,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1520,21 +1523,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -1592,7 +1595,7 @@ msgstr "Gotowe"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1608,12 +1611,12 @@ msgstr ""
" Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
" na związku z rzeczywistą sytuacją!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Nie udało się zmienić nazwy %s na %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1662,8 +1665,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1701,24 +1704,6 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
msgid "[Mirror: %s]"
msgstr "[Serwer lustrzany: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - łatka "
-"wygląda na uszkodzoną."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z "
-"mmap - łatka wygląda na uszkodzoną"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nie udało się utworzyć potoku IPC do podprocesu"
@@ -2781,78 +2766,88 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Otwieranie %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u w liście źródeł %s jest zbyt długa."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3077,7 +3072,7 @@ msgstr "Błędny rozmiar"
msgid "Invalid file format"
msgstr "Nieprawidłowa operacja %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3086,16 +3081,16 @@ msgstr ""
"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3104,12 +3099,12 @@ msgstr ""
"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
"repozytorium nie będą wykonywane."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3119,12 +3114,12 @@ msgstr ""
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3133,12 +3128,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3569,6 +3564,20 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - "
+#~ "łatka wygląda na uszkodzoną."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z "
+#~ "mmap - łatka wygląda na uszkodzoną"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Uwaga, wybieranie %s dla zadania \"%s\"\n"
diff --git a/po/pt.po b/po/pt.po
index 2ca93d930..b114db28d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -100,7 +100,7 @@ msgstr "O ficheiro do pacote %s está dessincronizado."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Não foi encontrado nenhum pacote"
@@ -725,13 +725,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -768,11 +771,11 @@ msgid "File not found"
msgstr "Ficheiro não encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -847,9 +850,9 @@ msgstr "Uma resposta sobrecarregou o buffer."
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Erro de escrita"
@@ -1109,7 +1112,7 @@ msgstr "A ligação falhou"
msgid "Internal error"
msgstr "Erro interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1357,101 +1360,101 @@ msgstr "Instalar estes pacotes sem verificação?"
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Serão instalados os seguintes NOVOS pacotes:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Serão REMOVIDOS os seguintes pacotes:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Serão actualizados os seguintes pacotes:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1459,27 +1462,27 @@ msgstr ""
"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1488,7 +1491,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1496,21 +1499,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1568,7 +1571,7 @@ msgstr "Pronto"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1584,12 +1587,12 @@ msgstr ""
"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
"\tpor isso não confie na relevância da real situação actual!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Falha ao baixar %s %s\n"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1635,8 +1638,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1674,24 +1677,6 @@ msgstr "Não pode ler ficheiro de mirror '%s'"
msgid "[Mirror: %s]"
msgstr "[Mirror: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Não foi possível aplicar o patch %s com mmap e com a utilização de operação "
-"de ficheiro - o patch parece estar corrompido."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Não foi possível aplicar o patch %s com mmap (mas não é uma falha especifica "
-"do mmap) - o patch parece corrompido."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falha ao criar pipe IPC para subprocesso"
@@ -2758,79 +2743,89 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "A abrir %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3065,7 +3060,7 @@ msgstr "Tamanho incorrecto"
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3074,18 +3069,18 @@ msgstr ""
"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
"errada em sources.list ou ficheiro malformado)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3094,12 +3089,12 @@ msgstr ""
"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
"aplicadas as actualizações para este repositório."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3110,12 +3105,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3125,12 +3120,12 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3560,6 +3555,20 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Não foi possível aplicar o patch %s com mmap e com a utilização de "
+#~ "operação de ficheiro - o patch parece estar corrompido."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Não foi possível aplicar o patch %s com mmap (mas não é uma falha "
+#~ "especifica do mmap) - o patch parece corrompido."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Note, a seleccionar '%s' para a tarefa '%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 05027f37c..9e5a5c2d0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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."
@@ -100,7 +100,7 @@ msgstr "O arquivo de pacote %s está fora de sincronia."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nenhum pacote encontrado"
@@ -697,13 +697,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -740,11 +743,11 @@ msgid "File not found"
msgstr "Arquivo não encontrado"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -819,9 +822,9 @@ msgstr "Uma resposta sobrecarregou o buffer"
msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Erro de escrita"
@@ -1082,7 +1085,7 @@ msgstr "Conexão falhou"
msgid "Internal error"
msgstr "Erro interno"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1333,101 +1336,101 @@ msgstr "Instalar estes pacotes sem verificação?"
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências desencontradas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "mas não será instalado"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir serão instalados:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir serão REMOVIDOS:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir serão atualizados:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir serão REVERTIDOS:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1436,27 +1439,27 @@ msgstr ""
"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
"fazendo!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu não atualizados.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1465,7 +1468,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1473,21 +1476,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1545,7 +1548,7 @@ msgstr "Pronto"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1557,12 +1560,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Falha ao baixar %s %s\n"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1608,8 +1611,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1647,20 +1650,6 @@ msgstr "Não foi possível abrir arquivo %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falhou ao criar pipe IPC para sub-processo"
@@ -2722,81 +2711,91 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossível analisar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3024,35 +3023,35 @@ msgstr "Tamanho incorreto"
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3060,12 +3059,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3075,12 +3074,12 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/ro.po b/po/ro.po
index 7f36345dd..90d46423a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -102,7 +102,7 @@ msgstr "Fișierul pachetului %s este desincronizat."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Nu s-au găsit pachete"
@@ -696,13 +696,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -739,11 +742,11 @@ msgid "File not found"
msgstr "Fișier negăsit"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Eșec la „stat”"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -818,9 +821,9 @@ msgstr "Un răspuns a depășit zona de tampon."
msgid "Protocol corruption"
msgstr "Protocol corupt"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Eroare de scriere"
@@ -1084,7 +1087,7 @@ msgstr "Conectare eșuată"
msgid "Internal error"
msgstr "Eroare internă"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1339,101 +1342,101 @@ msgstr "Instalați aceste pachete fără verificare?"
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Următoarele pachete au dependențe neîndeplinite:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "dar %s este pe cale de a fi instalat"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "dar nu este pe cale să fie instalat"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " sau"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ȘTERSE:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost reținute:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Următoarele pachete ținute vor fi schimbate:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1441,27 +1444,27 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n"
"Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de șters și %lu neînnoite.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau șterse incomplet.\n"
@@ -1470,7 +1473,7 @@ msgstr "%lu instalate sau șterse incomplet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1478,21 +1481,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -1550,7 +1553,7 @@ msgstr "Terminat"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1562,12 +1565,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Eșec la redenumirea lui %s în %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1613,8 +1616,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1652,20 +1655,6 @@ msgstr "Nu s-a putut deschide fișierul %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Eșec la crearea conexiunii IPC către subproces"
@@ -2731,76 +2720,86 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linie greșită %lu în lista sursă %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greșită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3028,37 +3027,37 @@ msgstr "Nepotrivire dimensiune"
msgid "Invalid file format"
msgstr "Operațiune invalidă %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3066,12 +3065,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3080,12 +3079,12 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/ru.po b/po/ru.po
index 74e1e9ee3..02a5424e7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -108,7 +108,7 @@ msgstr "Список пакетов %s рассинхронизирован."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Не найдено ни одного пакета"
@@ -730,13 +730,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -773,11 +776,11 @@ msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -854,9 +857,9 @@ msgstr "Ответ переполнил буфер."
msgid "Protocol corruption"
msgstr "Искажение протокола"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Ошибка записи"
@@ -1116,7 +1119,7 @@ msgstr "Соединение разорвано"
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1375,102 +1378,102 @@ msgstr "Установить эти пакеты без проверки?"
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Установлен]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Установлен]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Установлен]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "но %s уже установлен"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "но %s будет установлен"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "но он не может быть установлен"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "но это виртуальный пакет"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "но он не установлен"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "но он не будет установлен"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "НОВЫЕ пакеты, которые будут установлены:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Пакеты, которые будут обновлены:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr ""
"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (вследствие %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1478,27 +1481,27 @@ msgstr ""
"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, установлено %lu новых пакетов, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "переустановлено %lu переустановлено, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на старые версии, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не установлено до конца или удалено %lu пакетов.\n"
@@ -1507,7 +1510,7 @@ msgstr "не установлено до конца или удалено %lu п
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[Д/н]"
@@ -1515,21 +1518,21 @@ msgstr "[Д/н]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "д"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "н"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения — %s"
@@ -1589,7 +1592,7 @@ msgstr "Готово"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1605,12 +1608,12 @@ msgstr ""
" Учтите, что блокировка не используется,\n"
" поэтому нет полного соответствия с текущей реальной ситуацией!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Не удалось переименовать %s в %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1656,8 +1659,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1695,24 +1698,6 @@ msgstr "Невозможно прочитать файл на зеркале «%
msgid "[Mirror: %s]"
msgstr "[Зеркало: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Не удалось наложить заплату %s с использованием mmap и файловой операции — "
-"вероятно, повреждена заплата."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) — "
-"вероятно, повреждена заплата."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Не удалось создать IPC-канал для порождённого процесса"
@@ -2782,80 +2767,90 @@ msgstr "Невозможно разобрать содержимое пакет
msgid "Unable to parse package file %s (2)"
msgstr "Невозможно разобрать содержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
"значения)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3084,7 +3079,7 @@ msgstr "Не совпадает размер"
msgid "Invalid file format"
msgstr "Неверная операция %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3093,16 +3088,16 @@ msgstr ""
"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
"в sources.list или файл)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3111,12 +3106,12 @@ msgstr ""
"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
"репозитория производиться не будет."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3126,12 +3121,12 @@ msgstr ""
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3140,12 +3135,12 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3573,6 +3568,20 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
+#~ 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) — "
+#~ "вероятно, повреждена заплата."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Заметьте, выбирается «%s» для задачи «%s»\n"
diff --git a/po/sk.po b/po/sk.po
index a1a2aff50..350d1e7a7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -102,7 +102,7 @@ msgstr "Súbor balíkov %s je neaktuálny."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Neboli nájdené žiadne balíky"
@@ -716,13 +716,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -759,11 +762,11 @@ msgid "File not found"
msgstr "Súbor sa nenašiel"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie času zmeny"
@@ -838,9 +841,9 @@ msgstr "Odpoveď preplnila zásobník."
msgid "Protocol corruption"
msgstr "Narušenie protokolu"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Chyba pri zápise"
@@ -1096,7 +1099,7 @@ msgstr "Spojenie zlyhalo"
msgid "Internal error"
msgstr "Vnútorná chyba"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1352,101 +1355,101 @@ msgstr "Nainštalovať tieto nekontrolované balíky?"
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Nasledovné balíky majú nesplnené závislosti:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ale inštalovať sa bude %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " alebo"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Nasledovné pridržané balíky sa zmenia:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1454,27 +1457,27 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, čo robíte, tak to NEROBTE!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
@@ -1483,7 +1486,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1491,21 +1494,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -1563,7 +1566,7 @@ msgstr "Hotovo"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1579,12 +1582,12 @@ msgstr ""
" Tiež pamätajte, že zamykanie je deaktivované, takže\n"
" sa nespoliehajte na to že to bude platiť v reálnej situácii!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Premenovanie %s na %s zlyhalo"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1630,8 +1633,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1669,24 +1672,6 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
msgid "[Mirror: %s]"
msgstr "[Zrkadlo: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá "
-"sa, že záplata je poškodená."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca "
-"sa mmap) - zdá sa, že záplata je poškodená."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
@@ -2737,77 +2722,87 @@ 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:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, 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:143
+#: apt-pkg/sourcelist.cc:191
#, 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:150
+#: apt-pkg/sourcelist.cc:198
#, 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:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, 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:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, 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:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3029,7 +3024,7 @@ msgstr "Veľkosti sa nezhodujú"
msgid "Invalid file format"
msgstr "Neplatná operácia %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3038,16 +3033,16 @@ msgstr ""
"Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna "
"položka sources.list alebo chybný formát súboru)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3056,12 +3051,12 @@ msgstr ""
"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
"softvéru sa nepoužijú."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3071,12 +3066,12 @@ msgstr ""
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,12 +3080,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3507,6 +3502,20 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - "
+#~ "zdá sa, že záplata je poškodená."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba "
+#~ "týkajúca sa mmap) - zdá sa, že záplata je poškodená."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Poznámka: vyberá sa „%s“ pre úlohu „%s“\n"
diff --git a/po/sl.po b/po/sl.po
index ebf149be0..41f2d8266 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -102,7 +102,7 @@ msgstr "Datoteka paketa %s ni usklajena."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Noben paket ni bil najden"
@@ -711,13 +711,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -754,11 +757,11 @@ msgid "File not found"
msgstr "Datoteke ni mogoče najti"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Določitev ni uspela"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Nastavitev časa spremembe je spodletela"
@@ -833,9 +836,9 @@ msgstr "Odgovor je prekoračil predpomnilnik."
msgid "Protocol corruption"
msgstr "Okvara protokola"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Napaka pisanja"
@@ -1091,7 +1094,7 @@ msgstr "Povezava ni uspela"
msgid "Internal error"
msgstr "Notranja napaka"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1351,101 +1354,101 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?"
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Nameščeno]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nameščeno]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Nameščeno]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s nameščen"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s nameščen"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "vendar ni nameščen"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "vendar ne bo nameščen"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ali"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo nameščeni:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadržani:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1453,27 +1456,27 @@ msgstr ""
"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
@@ -1482,7 +1485,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1490,21 +1493,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka med prevajanjem logičnega izraza - %s"
@@ -1562,7 +1565,7 @@ msgstr "Opravljeno"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1578,12 +1581,12 @@ msgstr ""
" Zaklepanje je onemogočeno, zato se ne zanašajte\n"
" na pomembnost trenutnega pravega stanja!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Ni mogoče preimenovati %s v %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1629,8 +1632,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1668,24 +1671,6 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati"
msgid "[Mirror: %s]"
msgstr "[Zrcalni strežnik: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je "
-"videti pokvarjen"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - popravek "
-"je videti pokvarjen."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo"
@@ -2738,82 +2723,92 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
"razčleniti)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
"vrednosti)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Odpiranje %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3033,7 +3028,7 @@ msgstr "Neujemanje velikosti"
msgid "Invalid file format"
msgstr "Neveljavno opravilo %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3042,16 +3037,16 @@ msgstr ""
"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
"sources.list ali slabo oblikovana datoteka)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3060,12 +3055,12 @@ msgstr ""
"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
"skladišče ne bo uveljavljena."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3075,12 +3070,12 @@ msgstr ""
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3089,12 +3084,12 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket (zaradi manjkajočega arhiva)."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3514,6 +3509,20 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je "
+#~ "videti pokvarjen"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - "
+#~ "popravek je videti pokvarjen."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Izbiranje '%s' za nalogo '%s'\n"
diff --git a/po/sv.po b/po/sv.po
index 57da1162d..07fbf7078 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -102,7 +102,7 @@ msgstr "Paketfilen %s är inte synkroniserad."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Inga paket hittades"
@@ -696,13 +696,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -739,11 +742,11 @@ msgid "File not found"
msgstr "Filen hittades inte"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Misslyckades ställa in ändringstid"
@@ -818,9 +821,9 @@ msgstr "Ett svar spillde bufferten."
msgid "Protocol corruption"
msgstr "Protokollet skadat"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Skrivfel"
@@ -1084,7 +1087,7 @@ msgstr "Anslutningen misslyckades"
msgid "Internal error"
msgstr "Internt fel"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1336,101 +1339,101 @@ msgstr "Installera dessa paket utan verifiering?"
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "men %s är installerat"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "men %s kommer att installeras"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "men det är ett virtuellt paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "men det är inte installerat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "men det kommer inte att installeras"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Följande NYA paket kommer att installeras:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Följande paket kommer att TAS BORT:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Följande paket har hållits tillbaka:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Följande paket kommer att uppgraderas:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Följande paket kommer att NEDGRADERAS:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Följande tillbakahållna paket kommer att ändras:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (på grund av %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1438,27 +1441,27 @@ msgstr ""
"VARNING: Följande systemkritiska paket kommer att tas bort.\n"
"Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu att uppgradera, %lu att nyinstallera, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu att installera om, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu att nedgradera, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu är inte helt installerade eller borttagna.\n"
@@ -1467,7 +1470,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1475,21 +1478,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -1547,7 +1550,7 @@ msgstr "Färdig"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1563,12 +1566,12 @@ msgstr ""
" Tänk också på att låsningen är inaktiverad, så\n"
" förlita dig inte på relevansen till den verkliga situationen!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Misslyckades med att byta namn på %s till %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1619,8 +1622,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1659,24 +1662,6 @@ msgstr "Ingen spegelfil \"%s\" hittades "
msgid "[Mirror: %s]"
msgstr "[Spegel: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen "
-"verkar vara skadad."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen verkar "
-"vara skadad."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Misslyckades med att skapa IPC-rör till underprocess"
@@ -2739,76 +2724,86 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Rad %lu i källistan %s har (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Rad %lu i källistan %s har fel format (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Öppnar %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u är för lång i källistan %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i källistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3033,35 +3028,35 @@ msgstr "Storleken stämmer inte"
msgid "Invalid file format"
msgstr "Felaktig åtgärd %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3072,12 +3067,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3086,12 +3081,12 @@ 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3514,6 +3509,20 @@ msgstr ""
msgid "Not locked"
msgstr "Inte låst"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen "
+#~ "verkar vara skadad."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen "
+#~ "verkar vara skadad."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Observera, väljer \"%s\" för funktionen \"%s\"\n"
diff --git a/po/th.po b/po/th.po
index 509107d08..d15bb3ce8 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-10-27 22:44+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -100,7 +100,7 @@ msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับค
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "ไม่พบแพกเกจ"
@@ -698,13 +698,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -740,11 +743,11 @@ msgid "File not found"
msgstr "ไม่พบแฟ้ม"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
@@ -817,9 +820,9 @@ msgstr "คำตอบท่วมบัฟเฟอร์"
msgid "Protocol corruption"
msgstr "มีความเสียหายของโพรโทคอล"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "การเขียนข้อมูลผิดพลาด"
@@ -1073,7 +1076,7 @@ msgstr "เชื่อมต่อไม่สำเร็จ"
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1308,101 +1311,101 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "แต่ไม่สามารถติดตั้งได้"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "แต่ได้ติดตั้งไว้"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " หรือ"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (เนื่องจาก %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1410,27 +1413,27 @@ msgstr ""
"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "ติดตั้งซ้ำ %lu, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "ปรับรุ่นลง %lu, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
@@ -1439,7 +1442,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1447,21 +1450,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -1519,7 +1522,7 @@ msgstr "เสร็จแล้ว"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1535,12 +1538,12 @@ msgstr ""
" อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
" ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1586,8 +1589,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1625,21 +1628,6 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ
msgid "[Mirror: %s]"
msgstr "[แหล่งสำเนา: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"ไม่สามารถปรับแก้ %s ด้วย mmap (แต่ไม่พบข้อผิดพลาดที่เจาะจงเฉพาะ mmap) - ดูเหมือนแพตช์จะเสีย"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย"
@@ -2678,76 +2666,86 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
msgid "Unable to parse package file %s (2)"
msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "กำลังเปิด %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2966,7 +2964,7 @@ msgstr "ขนาดไม่ตรงกัน"
msgid "Invalid file format"
msgstr "ไม่รู้จักคำสั่ง %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2975,16 +2973,16 @@ msgstr ""
"ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
"หรือแฟ้มผิดรูปแบบ)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2993,12 +2991,12 @@ msgstr ""
"แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
"ของคลังแพกเกจนี้"
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3008,24 +3006,24 @@ msgstr ""
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, 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:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3425,6 +3423,18 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
+#~ 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) - "
+#~ "ดูเหมือนแพตช์จะเสีย"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "หมายเหตุ: จะเลือก '%s' สำหรับงานติดตั้ง '%s'\n"
diff --git a/po/tl.po b/po/tl.po
index 05d606f97..84ddfdc76 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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"
@@ -105,7 +105,7 @@ msgstr "Wala sa sync ang talaksan ng paketeng %s."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Walang nahanap na mga pakete"
@@ -693,13 +693,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -736,11 +739,11 @@ msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -815,9 +818,9 @@ msgstr "May sagot na bumubo sa buffer."
msgid "Protocol corruption"
msgstr "Sira ang protocol"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Error sa pagsulat"
@@ -1077,7 +1080,7 @@ msgstr "Bigo ang koneksyon"
msgid "Internal error"
msgstr "Internal na error"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1323,101 +1326,101 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ngunit ang %s ay nakaluklok"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ngunit ang %s ay iluluklok"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ngunit hindi ito maaaring iluklok"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ngunit ito ay hindi nakaluklok"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ngunit ito ay hindi iluluklok"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1425,27 +1428,27 @@ msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu iniluklok muli, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
@@ -1454,7 +1457,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[O/h]"
@@ -1462,21 +1465,21 @@ msgstr "[O/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[o/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -1534,7 +1537,7 @@ msgstr "Tapos"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1546,12 +1549,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1597,8 +1600,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1636,20 +1639,6 @@ msgstr "Hindi mabuksan ang talaksang %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Bigo sa paglikha ng IPC pipe sa subprocess"
@@ -2715,76 +2704,86 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3012,35 +3011,35 @@ msgstr "Di tugmang laki"
msgid "Invalid file format"
msgstr "Di tanggap na operasyon %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
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:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3048,12 +3047,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3062,12 +3061,12 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/po/tr.po b/po/tr.po
index beead72f9..bc4947160 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2013-02-18 03:41+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish\n"
@@ -102,7 +102,7 @@ msgstr "%s paket dosyası eşzamansız."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Hiç paket bulunamadı"
@@ -718,13 +718,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -761,11 +764,11 @@ msgid "File not found"
msgstr "Dosya bulunamadı"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Durum bilgisi okunamadı"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Değişiklik zamanı ayarlanamadı"
@@ -840,9 +843,9 @@ msgstr "Bir yanıt arabelleği taşırdı."
msgid "Protocol corruption"
msgstr "İletişim kuralları bozulması"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Yazma hatası"
@@ -1096,7 +1099,7 @@ msgstr "Bağlantı başarısız"
msgid "Internal error"
msgstr "İç hata"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1348,101 +1351,101 @@ msgstr "Paketler doğrulanmadan kurulsun mu?"
msgid "Failed to fetch %s %s\n"
msgstr "%s ağdan alınamadı. %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "ama %s kurulu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "ama %s kurulacak"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "ama kurulabilir değil"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "ama o bir sanal paket"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "ama kurulu değil"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "ama kurulmayacak"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " ya da"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Aşağıdaki YENİ paketler kurulacak:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Aşağıdaki paketler KALDIRILACAK:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Aşağıdaki paketler yükseltilecek:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s nedeniyle) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1450,27 +1453,27 @@ msgstr ""
"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu paket yeniden kurulacak, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu paketin sürümü düşürülecek, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
@@ -1479,7 +1482,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[E/h]"
@@ -1487,21 +1490,21 @@ msgstr "[E/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[e/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex derleme hatası - %s"
@@ -1561,7 +1564,7 @@ msgstr "Bitti"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1577,12 +1580,12 @@ msgstr ""
" Unutmayın ki simülasyonda kilitleme yapılmaz,\n"
" bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin."
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "%s, %s olarak yeniden adlandırılamadı"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1628,8 +1631,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1667,23 +1670,6 @@ msgstr "Yansı dosyası %s okunamıyor"
msgid "[Mirror: %s]"
msgstr "[Yansı: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi duruyor."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi "
-"duruyor."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Altsürece IPC borusu oluşturulamadı"
@@ -2747,87 +2733,98 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Paket dosyası %s ayrıştırılamadı (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
"ayrıştırılamıyor)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
"değil)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
"anahtarı yok)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
"anahtarına değer atanmamış)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "%s Açılıyor"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3053,7 +3050,7 @@ msgstr "Boyutlar eşleşmiyor"
msgid "Invalid file format"
msgstr "Geçersiz işlem: %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3062,17 +3059,17 @@ msgstr ""
"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
"dosyasındaki girdi ya da satır hatalı)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3081,12 +3078,12 @@ msgstr ""
"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
"güncelleştirmeleri uygulanmayacak."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3096,12 +3093,12 @@ msgstr ""
"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hatası: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3110,12 +3107,12 @@ msgstr ""
"%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3530,6 +3527,20 @@ msgstr ""
msgid "Not locked"
msgstr "Kilitlenmemiş"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi "
+#~ "duruyor."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi "
+#~ "duruyor."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Bilgi, '%2$s' görevi için '%1$s' seçiliyor\n"
diff --git a/po/uk.po b/po/uk.po
index a6858646e..c90ad239b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -109,7 +109,7 @@ msgstr "Перелік пакунків %s розсинхронізований.
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Не знайдено жодного пакунка"
@@ -728,13 +728,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -772,12 +775,12 @@ msgid "File not found"
msgstr "Файл не знайдено"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
#, fuzzy
msgid "Failed to stat"
msgstr "Не вдалося одержати атрибути (stat)"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Не вдалося встановити час модифікації"
@@ -852,9 +855,9 @@ msgstr "Відповідь переповнила буфер."
msgid "Protocol corruption"
msgstr "Спотворений протокол"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Помилка запису"
@@ -1112,7 +1115,7 @@ msgstr "З'єднання не вдалося"
msgid "Internal error"
msgstr "Внутрішня помилка"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1369,101 +1372,101 @@ msgstr "Встановити ці пакунки без перевірки?"
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [Встановлено]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Встановлено]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [Встановлено]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Пакунки, що мають незадоволені залежності:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "але %s вже встановлений"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "але %s буде встановлений"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "але він не може бути встановлений"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "але це віртуальний пакунок"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "але він не встановлений"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "але він не буде встановлений"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " чи"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "НОВІ пакунки, які будуть встановлені:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Пакунки, які залишені в незмінному стані:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (внаслідок %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1471,27 +1474,27 @@ msgstr ""
"УВАГА: Наступні важливі пакунки будуть вилучені.\n"
"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "оновлено %lu, встановлено %lu нових, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu перевстановлено, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu замінено на старіші версії, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
@@ -1500,7 +1503,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1508,21 +1511,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -1581,7 +1584,7 @@ msgstr "Виконано"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1597,12 +1600,12 @@ msgstr ""
" Також не забувайте, що блокування вимикається,\n"
" тому не очікуйте на відповідність поточній реальній ситуації!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Не вдалося перейменувати %s на %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1648,8 +1651,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1687,24 +1690,6 @@ msgstr "Неможливо прочитати файл дзеркала '%s'"
msgid "[Mirror: %s]"
msgstr "[Дзеркало: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає "
-"пошкодженим."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч "
-"виглядає пошкодженим."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Не вдалося створити IPC канал для підпроцесу"
@@ -2782,78 +2767,88 @@ msgstr "Неможливо проаналізувати файл пакунку
msgid "Unable to parse package file %s (2)"
msgstr "Неможливо проаналізувати файл пакунку %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Відкриття %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Рядок %u є занадто довгим у переліку джерел %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3077,7 +3072,7 @@ msgstr "Невідповідність розміру"
msgid "Invalid file format"
msgstr "Невірна дія %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3086,16 +3081,16 @@ msgstr ""
"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
"sources.list, або пошкоджений файл)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3104,12 +3099,12 @@ msgstr ""
"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
"репозиторія не будуть застосовані."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3119,12 +3114,12 @@ msgstr ""
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3133,12 +3128,12 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3568,6 +3563,20 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблоковано"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає "
+#~ "пошкодженим."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч "
+#~ "виглядає пошкодженим."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Помітьте, вибирається '%s' для завдання '%s'\n"
diff --git a/po/vi.po b/po/vi.po
index 905cadd43..5f3ab193e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.14.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2014-01-01 13:45+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -104,7 +104,7 @@ msgstr "Tập tin gói %s không đồng bộ được."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "Không tìm thấy gói"
@@ -733,17 +733,21 @@ msgstr ""
" apt-mark(8) và apt.conf(5)"
#: cmdline/apt.cc:71
+#, fuzzy
msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -793,11 +797,11 @@ msgid "File not found"
msgstr "Không tìm thấy tập tin"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "Gặp lỗi khi lấy thống kê"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "Gặp lỗi khi đặt giờ sửa đổi"
@@ -872,9 +876,9 @@ msgstr "Một trả lời đã tràn bộ đệm."
msgid "Protocol corruption"
msgstr "Giao thức bị hỏng"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "Lỗi ghi"
@@ -1136,7 +1140,7 @@ msgstr "Kết nối bị lỗi"
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr "Đang liệt kê"
@@ -1378,98 +1382,98 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?"
msgid "Failed to fetch %s %s\n"
msgstr "Gặp lỗi khi lấy về %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr "đã cài, có thể nâng cấp thành: "
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
msgid "[installed,local]"
msgstr "[đã cài đặt,nội bộ]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr "[đã cài, có thể tự động gỡ bỏ]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
msgid "[installed,automatic]"
msgstr "[đã cài đặt,tự động]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
msgid "[installed]"
msgstr "[đã cài đặt]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr "[có thể nâng cấp từ: "
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr "[residual-config]"
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "nhưng mà %s đã được cài đặt"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "nhưng mà %s sẽ được cài đặt"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "nhưng mà nó không có khả năng cài đặt"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "nhưng mà nó là gói ảo"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "nhưng mà nó không được cài đặt"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "nhưng mà nó sẽ không được cài đặt"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " hay"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "Những gói MỚI sau sẽ được cài đặt:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "Những gói sau sẽ bị GỠ BỎ:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "Những gói sau đây được giữ lại:"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "Những gói sau đây sẽ được thay đổi:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (bởi vì %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1477,27 +1481,27 @@ msgstr ""
"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu được cài đặt lại, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "%lu bị hạ cấp, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
@@ -1506,7 +1510,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr "[C/k]"
@@ -1514,21 +1518,21 @@ msgstr "[C/k]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr "[c/K]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr "C"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr "K"
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dịch biểu thức chính quy - %s"
@@ -1585,7 +1589,7 @@ msgstr "Xong"
msgid "Full Text Search"
msgstr "Tìm kiếm toàn văn"
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr "không là gói thật (ảo)"
@@ -1601,12 +1605,12 @@ msgstr ""
" Cần nhớ rằng chức năng khóa đã bị tắt,\n"
" nên có thể nó không chính xác như những gì làm thật!"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? "
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”."
@@ -1652,8 +1656,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1691,23 +1695,6 @@ msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”"
msgid "[Mirror: %s]"
msgstr "[Bản sao: %s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị hỏng."
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là "
-"miếng vá bị hỏng."
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
@@ -2784,85 +2771,95 @@ msgstr "Không thể phân tích tập tin gói %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Không thể phân tích tập tin gói %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
"tích được)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
"gán)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
"trị)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "Đang mở %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Dòng %u quá dài trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -3086,7 +3083,7 @@ msgstr "Kích cỡ không khớp nhau"
msgid "Invalid file format"
msgstr "Định dạng tập tập tin không hợp lệ"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3095,16 +3092,16 @@ msgstr ""
"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong "
"sources.list hoặc tập tin bị hỏng)"
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3113,12 +3110,12 @@ msgstr ""
"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho "
"này sẽ không được áp dụng."
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3129,12 +3126,12 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3143,12 +3140,12 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”"
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3571,6 +3568,20 @@ msgstr ""
msgid "Not locked"
msgstr "Chưa được khoá"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị "
+#~ "hỏng."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là "
+#~ "miếng vá bị hỏng."
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Ghi chú: đang chọn “%s” cho tác vụ “%s”\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 79ea2286e..7d3269753 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+0100\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -101,7 +101,7 @@ msgstr "软件包文件 %s 尚未同步。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "没有发现匹配的软件包"
@@ -685,13 +685,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -728,11 +731,11 @@ msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -806,9 +809,9 @@ msgstr "回应超出了缓存区大小。"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "写出错"
@@ -1062,7 +1065,7 @@ msgstr "连接失败"
msgid "Internal error"
msgstr "内部错误"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1294,101 +1297,101 @@ msgstr "不经验证就安装这些软件包吗？"
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的依赖关系："
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "但无法安装它"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr " 或"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装："
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】："
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变："
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级："
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】："
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变："
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1396,27 +1399,27 @@ msgstr ""
"【警告】：下列基础软件包将被卸载。\n"
"请勿尝试，除非您确实知道您在做什么！"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包，"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
@@ -1425,7 +1428,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1433,21 +1436,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -1505,7 +1508,7 @@ msgstr "完成"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1520,12 +1523,12 @@ msgstr ""
"　　　apt-get 需要 root 特权进行实际的执行。\n"
"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "无法将 %s 重命名为 %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1571,8 +1574,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1610,20 +1613,6 @@ msgstr "没有找到镜像文件 %s"
msgid "[Mirror: %s]"
msgstr "[镜像：%s]"
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为子进程创建 IPC 管道"
@@ -2667,76 +2656,86 @@ msgstr "无法解析软件包文件 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#: apt-pkg/sourcelist.cc:144
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2956,35 +2955,35 @@ msgstr "大小不符"
msgid "Invalid file format"
msgstr "无效的操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2993,12 +2992,12 @@ msgstr ""
"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误：%s: %s"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3007,12 +3006,12 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3413,6 +3412,16 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "注意，为任务 %2$s 选中了 %1$s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dedc5ae49..52f96ab81 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"POT-Creation-Date: 2014-01-18 21:25+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."
@@ -101,7 +101,7 @@ msgstr "套件檔 %s 未同步。"
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
msgid "No packages found"
msgstr "未找到套件"
@@ -678,13 +678,16 @@ msgid ""
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
+" remove - remove packages\n"
+"\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -720,11 +723,11 @@ msgid "File not found"
msgstr "找不到檔案"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626
msgid "Failed to stat"
msgstr "無法取得狀態"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -798,9 +801,9 @@ msgstr "回應超過緩衝區長度。"
msgid "Protocol corruption"
msgstr "協定失敗"
-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425
msgid "Write error"
msgstr "寫入錯誤"
@@ -1055,7 +1058,7 @@ msgstr "連線失敗"
msgid "Internal error"
msgstr "內部錯誤"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
@@ -1294,101 +1297,101 @@ msgstr "是否不經驗證就安裝這些套件？"
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s，%s\n"
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200
msgid "installed,upgradable to: "
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206
#, fuzzy
msgid "[installed,local]"
msgstr "【已安裝】"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,automatic]"
msgstr "【已安裝】"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213
#, fuzzy
msgid "[installed]"
msgstr "【已安裝】"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219
msgid "[upgradable from: "
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316
msgid "The following packages have unmet dependencies:"
msgstr "下列的套件有未滿足的相依關係："
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406
#, c-format
msgid "but %s is installed"
msgstr "但 %s 卻已安裝"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408
#, c-format
msgid "but %s is to be installed"
msgstr "但 %s 卻將被安裝"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415
msgid "but it is not installable"
msgstr "但它卻無法安裝"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417
msgid "but it is a virtual package"
msgstr "但它是虛擬套件"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not installed"
msgstr "但它卻尚未安裝"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420
msgid "but it is not going to be installed"
msgstr "但它卻將不會被安裝"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425
msgid " or"
msgstr "或"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454
msgid "The following NEW packages will be installed:"
msgstr "下列【新】套件將會被安裝："
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480
msgid "The following packages will be REMOVED:"
msgstr "下列套件將會被【移除】："
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502
msgid "The following packages have been kept back:"
msgstr "下列套件將會維持其原有版本："
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523
msgid "The following packages will be upgraded:"
msgstr "下列套件將會被升級："
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544
msgid "The following packages will be DOWNGRADED:"
msgstr "下列套件將會被【降級】："
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564
msgid "The following held packages will be changed:"
msgstr "下列被保留 (hold) 的套件將會被更改："
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619
#, c-format
msgid "%s (due to %s) "
msgstr "%s（因為 %s）"
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1396,27 +1399,27 @@ msgstr ""
"【警告】：下列的基本套件都將被移除。\n"
"除非您很清楚您在做什麼，否則請勿輕易嘗試！"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升級 %lu 個，新安裝 %lu 個，"
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安裝 %lu 個，"
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664
#, c-format
msgid "%lu downgraded, "
msgstr "降級 %lu 個，"
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個沒有完整得安裝或移除。\n"
@@ -1425,7 +1428,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692
msgid "[Y/n]"
msgstr ""
@@ -1433,21 +1436,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -1505,7 +1508,7 @@ msgstr "完成"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105
msgid "not a real package (virtual)"
msgstr ""
@@ -1517,12 +1520,12 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "無法將 %s 更名為 %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
@@ -1568,8 +1571,8 @@ msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
+#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
@@ -1607,20 +1610,6 @@ msgstr "無法開啟檔案 %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "無法和子程序建立 IPC 管線"
@@ -2666,76 +2655,86 @@ msgstr "無法辨識套件檔 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "無法辨識套件檔 %s (2)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
+
+#: apt-pkg/sourcelist.cc:144
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:147
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:158
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:167
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:180
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:182
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:185
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:198
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:309
#, c-format
msgid "Opening %s"
msgstr "正在開啟 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:345
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:349
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
@@ -2950,35 +2949,35 @@ msgstr "大小不符"
msgid "Invalid file format"
msgstr "無效的操作 %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2986,12 +2985,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,12 +2999,12 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
"台）"
-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
diff --git a/test/integration/framework b/test/integration/framework
index 6620c78dd..ca2f90050 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -951,11 +951,20 @@ testempty() {
}
testequal() {
+ local MSG='Test of equality of'
+ if [ "$1" = '--nomsg' ]; then
+ MSG=''
+ shift
+ fi
+
local COMPAREFILE=$(mktemp)
addtrap "rm $COMPAREFILE;"
echo "$1" > $COMPAREFILE
shift
- msgtest "Test for equality of" "$*"
+
+ if [ -n "$MSG" ]; then
+ msgtest "$MSG" "$*"
+ fi
$* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
}
diff --git a/test/integration/test-apt-progress-fd-conffile b/test/integration/test-apt-progress-fd-conffile
index 0b42b1b2f..085d5e871 100755
--- a/test/integration/test-apt-progress-fd-conffile
+++ b/test/integration/test-apt-progress-fd-conffile
@@ -32,12 +32,19 @@ testsuccess aptget install compiz-core=1.0
# fake conffile change
echo "meep" >> rootdir/etc/compiz.conf/compiz.conf
-# install
+# FIXME: Is there really no way to see if dpkg actually prompts?
+msgtest 'Test for successful execution of' 'apt-get install compiz-core=2.0'
+OUTPUT=$(mktemp)
+addtrap "rm $OUTPUT;"
exec 3> apt-progress.log
-echo n | aptget install compiz-core=2.0 -o APT::Status-Fd=3 -o Dpkg::Use-Pty=false
+if aptget install compiz-core=2.0 -o APT::Status-Fd=3 -o Dpkg::Use-Pty=false -o dpkg::options::='--force-confold' >${OUTPUT} 2>&1; then
+ msgpass
+else
+ echo
+ cat $OUTPUT
+ msgfail
+fi
# and ensure there is a conffile message in the file
-msgtest "Conffile prompt in apt-progress.log"
+msgtest 'Test status fd for an included' 'pmconffile msg'
grep -q "pmconffile:/etc/compiz.conf/compiz.conf" apt-progress.log && msgpass || (cat apt-progress.log && msgfail)
-
-cat apt-progress.log \ No newline at end of file
diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
new file mode 100755
index 000000000..6e9a02417
--- /dev/null
+++ b/test/integration/test-apt-sources-deb822
@@ -0,0 +1,87 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'i386'
+
+SOURCES='rootdir/etc/apt/sources.list'
+BASE='# some comment
+# that contains a : as well
+#Type: meep
+
+Type: deb
+URI: http://ftp.debian.org/debian
+Suites: stable
+Sections: main
+Comment: Some random string
+ that can be very long'
+
+
+msgtest 'Test old-style sources.list'
+echo "deb http://ftp.debian.org/debian stable main" > $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+
+msgtest 'Test simple deb822 sources.list'
+echo "$BASE" > $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+
+
+msgtest 'Test deb822 with two sections' 'seperated by comma'
+echo "$BASE" | sed 's/main/main contrib/' > $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+
+
+msgtest 'Test deb822 with' 'two entries'
+# Two entries
+echo "$BASE" > $SOURCES
+echo "" >> $SOURCES
+echo "$BASE" | sed s/stable/unstable/ >> $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris
+
+# two suite entries
+msgtest 'Test deb822 with' 'two Suite entries'
+echo "$BASE" | sed -e "s/stable/stable unstable/" > $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris
+
+msgtest 'Test deb822' 'architecture option'
+echo "$BASE" > $SOURCES
+echo "Architectures: amd64,armel" >> $SOURCES
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+
+
+msgtest 'Test old-style sources.list file which has' 'malformed dist'
+echo "deb http://ftp.debian.org" > $SOURCES
+testequal --nomsg "E: Malformed line 1 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (dist)
+E: The list of sources could not be read." aptget update --print-uris
+
+
+msgtest 'Test deb822 sources.list file which has' 'malformed URI'
+echo "Type: deb
+Suites: stable
+" > $SOURCES
+testequal --nomsg "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
+E: The list of sources could not be read." aptget update --print-uris
diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir
index 0606538a1..0451fc1ed 100755
--- a/test/integration/test-bug-728500-tempdir
+++ b/test/integration/test-bug-728500-tempdir
@@ -7,12 +7,23 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture 'i386'
-buildsimplenativepackage 'coolstuff' 'all' '1.0' 'unstable'
+insertpackage 'unstable' 'coolstuff' 'all' '1.0'
setupaptarchive
changetowebserver
-msgtest 'Test with incorect TMPDIR'
+msgtest 'Test apt-get update with incorrect' 'TMPDIR'
+
+OUTPUT=$(mktemp)
+addtrap "rm $OUTPUT;"
export TMPDIR=/does-not-exists
-aptget update && msgpass || msgfail
-unset TMPDIR \ No newline at end of file
+if aptget update >${OUTPUT} 2>&1; then
+ msgpass
+else
+ echo
+ cat $OUTPUT
+ msgfail
+fi
+unset TMPDIR
+
+testequal 'coolstuff' aptcache pkgnames
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index ac0563b7f..ad31511b9 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -5,39 +5,155 @@ TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture "i386"
+configarchitecture 'i386'
buildaptarchive
setupflataptarchive
changetowebserver
-signreleasefiles
-testsuccess aptget update
-testnopackage newstuff
PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')"
-testequal "$(cat ${PKGFILE})
+
+echo '#!/bin/sh
+touch merge-was-used
+/usr/bin/diffindex-rred "$@"' > extrred
+chmod +x extrred
+echo 'Dir::Bin::rred "./extrred";' > rootdir/etc/apt/apt.conf.d/99rred
+
+wasmergeused() {
+ msgtest 'Test for successful execution of' "$*"
+ local OUTPUT=$(mktemp)
+ addtrap "rm $OUTPUT;"
+ if aptget update "$@" >${OUTPUT} 2>&1; then
+ msgpass
+ else
+ echo
+ cat $OUTPUT
+ msgfail
+ fi
+
+ msgtest 'Check if the right pdiff merger was used'
+ if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then
+ if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then
+ msgpass
+ else
+ msgfail "Merge shouldn't have been used, but was"
+ fi
+ elif echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then
+ msgfail "Merge should have been used, but wasn't"
+ else
+ msgpass
+ fi
+}
+
+testrun() {
+ # setup the base
+ find aptarchive -name 'Packages*' -type f -delete
+ cp ${PKGFILE} aptarchive/Packages
+ compressfile 'aptarchive/Packages'
+ generatereleasefiles
+ signreleasefiles
+ rm -rf aptarchive/Packages.diff rootdir/var/lib/apt/lists
+ testsuccess aptget update "$@"
+ cp -a rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists-bak
+ testnopackage newstuff
+ testequal "$(cat ${PKGFILE})
" aptcache show apt oldstuff
-cp ${PKGFILE}-new aptarchive/Packages
-compressfile 'aptarchive/Packages'
-rm -rf aptarchive/Packages.diff
-mkdir -p aptarchive/Packages.diff
-PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)"
-diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true
-cat $PATCHFILE | gzip > ${PATCHFILE}.gz
-PATCHINDEX="aptarchive/Packages.diff/Index"
-echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new)
+ msgmsg 'Testcase: apply with one patch'
+ cp ${PKGFILE}-new aptarchive/Packages
+ compressfile 'aptarchive/Packages'
+ mkdir -p aptarchive/Packages.diff
+ PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)"
+ diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true
+ cat $PATCHFILE | gzip > ${PATCHFILE}.gz
+ PATCHINDEX='aptarchive/Packages.diff/Index'
+ echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new)
SHA1-History:
9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28
$(sha1sum $PKGFILE | cut -d' ' -f 1) $(stat -c%s $PKGFILE) $(basename $PATCHFILE)
SHA1-Patches:
7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28
$(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX
-generatereleasefiles '+1hour'
-signreleasefiles
-find aptarchive -name 'Packages*' -type f -delete
-testsuccess aptget update
+ generatereleasefiles '+1hour'
+ signreleasefiles
+ find aptarchive -name 'Packages*' -type f -delete
+ wasmergeused "$@"
+ testnopackage oldstuff
+ testequal "$(cat ${PKGFILE}-new)
+" aptcache show apt newstuff
+
+ msgmsg 'Testcase: index is already up-to-date'
+ find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete
+ testsuccess aptget update "$@"
+ testequal "$(cat ${PKGFILE}-new)
+" aptcache show apt newstuff
+
+ msgmsg 'Testcase: apply with two patches'
+ cp ${PKGFILE}-new aptarchive/Packages
+ echo '
+Package: futurestuff
+Version: 1.0
+Architecture: i386
+Maintainer: Joe Sixpack <joe@example.org>
+Installed-Size: 202
+Filename: pool/futurestuff_1.0_i386.deb
+Size: 202200
+MD5sum: 311aeeaaae5ba33aff1ceaf3e1f76671
+SHA1: 3c695e028f7a1ae324deeaae5ba332desa81088c
+SHA256: b46fd154615edaae5ba33c56a5cc0e7deaef23e2da3e4f129727fd660f28f050
+Description: some cool and shiny future stuff
+ This package will appear in the next next mirror update
+Description-md5: d5f89fbbc2ce34c455dfee9b67d82b6b' >> aptarchive/Packages
+
+ compressfile 'aptarchive/Packages'
+ PATCHFILE2="aptarchive/Packages.diff/$(date -d 'now + 1hour' '+%Y-%m-%d-%H%M.%S')"
+ diff -e ${PKGFILE}-new aptarchive/Packages > ${PATCHFILE2} || true
+ cat $PATCHFILE2 | gzip > ${PATCHFILE2}.gz
+ echo "SHA1-Current: $(sha1sum aptarchive/Packages | cut -d' ' -f 1) $(stat -c%s aptarchive/Packages)
+SHA1-History:
+ 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28
+ $(sha1sum ${PKGFILE} | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}) $(basename ${PATCHFILE})
+ $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new) $(basename ${PATCHFILE2})
+SHA1-Patches:
+ 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28
+ $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)
+ $(sha1sum ${PATCHFILE2} | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE2}) $(basename ${PATCHFILE2})" > $PATCHINDEX
+ generatereleasefiles '+2hour'
+ signreleasefiles
+ cp -a aptarchive/Packages Packages-future
+ find aptarchive -name 'Packages*' -type f -delete
+ rm -rf rootdir/var/lib/apt/lists
+ cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists
+ wasmergeused "$@"
+ testnopackage oldstuff
+ testequal "$(cat Packages-future)
+" aptcache show apt newstuff futurestuff
-testnopackage oldstuff
-testequal "$(cat ${PKGFILE}-new)
+ msgmsg 'Testcase: patch applying fails, but successful fallback'
+ rm -rf rootdir/var/lib/apt/lists
+ cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists
+ cp ${PKGFILE}-new aptarchive/Packages
+ compressfile 'aptarchive/Packages'
+ mkdir -p aptarchive/Packages.diff
+ PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)"
+ diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true
+ PATCHINDEX='aptarchive/Packages.diff/Index'
+ echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new)
+SHA1-History:
+ 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28
+ $(sha1sum $PKGFILE | cut -d' ' -f 1) $(stat -c%s $PKGFILE) $(basename $PATCHFILE)
+SHA1-Patches:
+ 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28
+ $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX
+ echo 'I am Mallory and I change files' >> $PATCHFILE
+ cat $PATCHFILE | gzip > ${PATCHFILE}.gz
+ generatereleasefiles '+1hour'
+ signreleasefiles
+ testsuccess aptget update "$@"
+ testnopackage oldstuff
+ testequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
+}
+
+testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=0
+testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=1
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 73403b24c..a8e053d6e 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -111,3 +111,9 @@ SLIBS = -lapt-pkg
SOURCE = tagfile_test.cc
include $(PROGRAM_H)
+# test sourcelist
+PROGRAM = SourceList${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = sourcelist_test.cc
+include $(PROGRAM_H)
+
diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
new file mode 100644
index 000000000..701eeeaa7
--- /dev/null
+++ b/test/libapt/sourcelist_test.cc
@@ -0,0 +1,53 @@
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/tagfile.h>
+
+#include "assert.h"
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+char *tempfile = NULL;
+int tempfile_fd = -1;
+
+void remove_tmpfile(void)
+{
+ if (tempfile_fd > 0)
+ close(tempfile_fd);
+ if (tempfile != NULL) {
+ unlink(tempfile);
+ free(tempfile);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ const char contents[] = ""
+ "Type: deb\n"
+ "URI: http://ftp.debian.org/debian\n"
+ "Suites: stable\n"
+ "Sections: main\n"
+ "Comment: Some random string\n"
+ " that can be very long\n"
+ "\n"
+ "Type: deb\n"
+ "URI: http://ftp.debian.org/debian\n"
+ "Suite: unstable\n"
+ "Section: main non-free\n"
+ ;
+
+ FileFd fd;
+ atexit(remove_tmpfile);
+ tempfile = strdup("apt-test.XXXXXXXX");
+ tempfile_fd = mkstemp(tempfile);
+
+ /* (Re-)Open (as FileFd), write and seek to start of the temp file */
+ equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true);
+ equals(fd.Write(contents, strlen(contents)), true);
+ equals(fd.Seek(0), true);
+
+ pkgSourceList sources(tempfile);
+ equals(sources.size(), 2);
+
+ /* clean up handled by atexit handler, so just return here */
+ return 0;
+}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 11:05:44 +0000