summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire-item.cc61
-rw-r--r--apt-pkg/acquire-item.h14
-rw-r--r--apt-pkg/acquire-method.cc21
-rw-r--r--apt-pkg/acquire-method.h15
-rw-r--r--apt-pkg/deb/dpkgpm.cc97
-rw-r--r--apt-pkg/deb/dpkgpm.h4
-rw-r--r--apt-pkg/depcache.cc1
-rw-r--r--apt-pkg/init.cc2
-rw-r--r--apt-pkg/pkgrecords.cc4
-rw-r--r--apt-pkg/tagfile.cc2
-rw-r--r--cmdline/apt-get.cc30
-rwxr-xr-xcmdline/apt-key6
-rwxr-xr-xcmdline/apt-report-mirror-failure24
-rw-r--r--cmdline/makefile6
-rw-r--r--configure.in2
-rw-r--r--debian/apt.conf.autoremove4
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/apt.postinst4
-rw-r--r--debian/changelog711
-rw-r--r--debian/control10
-rwxr-xr-xdebian/rules6
-rw-r--r--doc/examples/configure-index26
-rw-r--r--doc/examples/sources.list12
-rw-r--r--methods/connect.cc18
-rw-r--r--methods/http.cc16
-rw-r--r--methods/http.h6
-rw-r--r--methods/http_main.cc15
-rw-r--r--methods/makefile16
-rw-r--r--methods/mirror.cc282
-rw-r--r--methods/mirror.h51
-rw-r--r--mirror-failure.py23
-rw-r--r--po/ChangeLog23
-rw-r--r--po/LINGUAS2
-rw-r--r--po/apt-all.pot214
-rw-r--r--po/ar.po2566
-rw-r--r--po/bg.po240
-rw-r--r--po/bs.po238
-rw-r--r--po/ca.po240
-rw-r--r--po/cs.po240
-rw-r--r--po/cy.po240
-rw-r--r--po/da.po240
-rw-r--r--po/de.po240
-rw-r--r--po/el.po240
-rw-r--r--po/en_GB.po240
-rw-r--r--po/es.po240
-rw-r--r--po/eu.po240
-rw-r--r--po/fi.po240
-rw-r--r--po/fr.po389
-rw-r--r--po/gl.po340
-rw-r--r--po/he.po238
-rw-r--r--po/hu.po244
-rw-r--r--po/it.po240
-rw-r--r--po/ja.po240
-rw-r--r--po/ko.po240
-rw-r--r--po/ku.po2665
-rw-r--r--po/nb.po240
-rw-r--r--po/nl.po240
-rw-r--r--po/nn.po240
-rw-r--r--po/pl.po244
-rw-r--r--po/pt.po240
-rw-r--r--po/pt_BR.po240
-rw-r--r--po/ro.po240
-rw-r--r--po/ru.po240
-rw-r--r--po/sk.po240
-rw-r--r--po/sl.po240
-rw-r--r--po/sv.po240
-rw-r--r--po/tl.po240
-rw-r--r--po/uk.po2897
-rw-r--r--po/vi.po305
-rw-r--r--po/zh_CN.po240
-rw-r--r--po/zh_TW.po240
-rw-r--r--share/debian-archive.gpg.movedbin0 -> 2717 bytes
72 files changed, 5997 insertions, 12338 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 6d71b6ea3..3b683df63 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -63,6 +63,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
Status = StatIdle;
ErrorText = LookupTag(Message,"Message");
+ UsedMirror = LookupTag(Message,"UsedMirror");
if (QueueCounter <= 1)
{
/* This indicates that the file is not available right now but might
@@ -75,10 +76,17 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
Dequeue();
return;
}
-
+
Status = StatError;
Dequeue();
}
+
+ // report mirror failure back to LP if we actually use a mirror
+ string FailReason = LookupTag(Message, "FailReason");
+ if(FailReason.size() != 0)
+ ReportMirrorFailure(FailReason);
+ else
+ ReportMirrorFailure(ErrorText);
}
/*}}}*/
// Acquire::Item::Start - Item has begun to download /*{{{*/
@@ -100,7 +108,7 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string,
{
// We just downloaded something..
string FileName = LookupTag(Message,"Filename");
- // we only inform the Log class if it was actually not a local thing
+ UsedMirror = LookupTag(Message,"UsedMirror");
if (Complete == false && !Local && FileName == DestFile)
{
if (Owner->Log != 0)
@@ -109,7 +117,6 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string,
if (FileSize == 0)
FileSize= Size;
-
Status = StatDone;
ErrorText = string();
Owner->Dequeue(this);
@@ -132,6 +139,49 @@ void pkgAcquire::Item::Rename(string From,string To)
}
/*}}}*/
+void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
+{
+ // we only act if a mirror was used at all
+ if(UsedMirror.empty())
+ return;
+#if 0
+ std::cerr << "\nReportMirrorFailure: "
+ << UsedMirror
+ << " Uri: " << DescURI()
+ << " FailCode: "
+ << FailCode << std::endl;
+#endif
+ const char *Args[40];
+ unsigned int i = 0;
+ string report = _config->Find("Methods::Mirror::ProblemReporting",
+ "/usr/lib/apt/apt-report-mirror-failure");
+ if(!FileExists(report))
+ return;
+ Args[i++] = report.c_str();
+ Args[i++] = UsedMirror.c_str();
+ Args[i++] = DescURI().c_str();
+ Args[i++] = FailCode.c_str();
+ Args[i++] = NULL;
+ pid_t pid = ExecFork();
+ if(pid < 0)
+ {
+ _error->Error("ReportMirrorFailure Fork failed");
+ return;
+ }
+ else if(pid == 0)
+ {
+ execvp(Args[0], (char**)Args);
+ std::cerr << "Could not exec " << Args[0] << std::endl;
+ _exit(100);
+ }
+ if(!ExecWait(pid, "report-mirror-failure"))
+ {
+ _error->Warning("Couldn't report problem to '%s'",
+ _config->Find("Methods::Mirror::ProblemReporting").c_str());
+ }
+}
+
+
// AcqDiffIndex::AcqDiffIndex - Constructor
// ---------------------------------------------------------------------
@@ -595,7 +645,6 @@ string pkgAcqIndex::Custom600Headers()
struct stat Buf;
if (stat(Final.c_str(),&Buf) != 0)
return "\nIndex-File: true";
-
return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
/*}}}*/
@@ -660,6 +709,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
Status = StatAuthError;
ErrorText = _("MD5Sum mismatch");
Rename(DestFile,DestFile + ".FAILED");
+ ReportMirrorFailure("HashChecksumFailure");
return;
}
// Done, move it into position
@@ -1064,7 +1114,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
// Queue Packages file (either diff or full packages files, depending
// on the users option)
- if(_config->FindB("Acquire::PDiffs",true) == true)
+ if(_config->FindB("Acquire::PDiffs",false) == true)
new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
(*Target)->ShortDesc, ExpectedIndexMD5);
else
@@ -1188,6 +1238,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
}
// gpgv method failed
+ ReportMirrorFailure("GPGFailure");
_error->Warning("GPG error: %s: %s",
Desc.Description.c_str(),
LookupTag(Message,"Message").c_str());
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f5272ed86..233cbdda9 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -142,6 +142,7 @@ class pkgAcquire::Item
* download progress indicator's overall statistics.
*/
bool Local;
+ string UsedMirror;
/** \brief The number of fetch queues into which this item has been
* inserted.
@@ -242,6 +243,17 @@ class pkgAcquire::Item
/** \return \b true if this object is being fetched from a trusted source. */
virtual bool IsTrusted() {return false;};
+
+ // report mirror problems
+ /** \brief Report mirror problem
+ *
+ * This allows reporting mirror failures back to a centralized
+ * server. The apt-report-mirror-failure script is called for this
+ *
+ * \param FailCode A short failure string that is send
+ */
+ void ReportMirrorFailure(string FailCode);
+
/** \brief Initialize an item.
*
@@ -542,7 +554,7 @@ class pkgAcqIndex : public pkgAcquire::Item
* (".bz2" is used if bzip2 is installed, ".gz" otherwise).
*/
pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, string ExpectedMD5, string compressExt="");
+ string ShortDesct, string ExpectedMD5, string compressExt="");
};
/** \brief An acquire item that is responsible for fetching a
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 3360a8eae..dfadf800f 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -96,12 +96,11 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
}
char S[1024];
+ char *End = S;
if (Queue != 0)
{
- snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n"
- "Message: %s %s\n",Queue->Uri.c_str(),Err.c_str(),
- FailExtra.c_str());
-
+ End += snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n"
+ "Message: %s %s\n",Queue->Uri.c_str(), Err.c_str(), IP.c_str());
// Dequeue
FetchItem *Tmp = Queue;
Queue = Queue->Next;
@@ -110,10 +109,14 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
QueueBack = Queue;
}
else
- snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: <UNKNOWN>\n"
- "Message: %s %s\n",Err.c_str(),
- FailExtra.c_str());
-
+ {
+ End += snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: <UNKNOWN>\n"
+ "Message: %s\n",Err.c_str());
+ }
+ if(FailReason.empty() == false)
+ End += snprintf(End,sizeof(S)-50 - (End - S),"FailReason: %s\n",FailReason.c_str());
+ if (UsedMirror.empty() == false)
+ End += snprintf(End,sizeof(S)-50 - (End - S),"UsedMirror: %s\n",UsedMirror.c_str());
// Set the transient flag
if (Transient == true)
strcat(S,"Transient-Failure: true\n\n");
@@ -179,6 +182,8 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
if (Res.SHA1Sum.empty() == false)
End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str());
+ if (UsedMirror.empty() == false)
+ End += snprintf(End,sizeof(S)-50 - (End - S),"UsedMirror: %s\n",UsedMirror.c_str());
if (Res.GPGVOutput.size() > 0)
End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n");
for (vector<string>::iterator I = Res.GPGVOutput.begin();
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 0fd846f54..89eb2e77f 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -58,7 +58,9 @@ class pkgAcqMethod
vector<string> Messages;
FetchItem *Queue;
FetchItem *QueueBack;
- string FailExtra;
+ string FailReason;
+ string UsedMirror;
+ string IP;
// Handlers for messages
virtual bool Configuration(string Message);
@@ -67,14 +69,14 @@ class pkgAcqMethod
// Outgoing messages
void Fail(bool Transient = false);
inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
- void Fail(string Why, bool Transient = false);
- void URIStart(FetchResult &Res);
- void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+ virtual void Fail(string Why, bool Transient = false);
+ virtual void URIStart(FetchResult &Res);
+ virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+
bool MediaFail(string Required,string Drive);
virtual void Exit() {};
public:
-
enum CnfFlags {SingleInstance = (1<<0),
Pipeline = (1<<1), SendConfig = (1<<2),
LocalOnly = (1<<3), NeedsCleanup = (1<<4),
@@ -84,7 +86,8 @@ class pkgAcqMethod
void Status(const char *Format,...);
int Run(bool Single = false);
- inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;};
+ inline void SetFailReason(string Msg) {FailReason = Msg;};
+ inline void SetIP(string aIP) {IP = aIP;};
pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
virtual ~pkgAcqMethod() {};
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index a63c4e412..3c367e421 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -12,6 +12,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/strutl.h>
#include <unistd.h>
@@ -34,7 +35,8 @@ using namespace std;
// DPkgPM::pkgDPkgPM - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache)
+pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
+ : pkgPackageManager(Cache), pkgFailures(0)
{
}
/*}}}*/
@@ -651,6 +653,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
line[0]=0;
if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
std::clog << "send: '" << status.str() << "'" << endl;
+ pkgFailures++;
+ WriteApportReport(list[1], list[3]);
continue;
}
if(strncmp(action,"conffile",strlen("conffile")) == 0)
@@ -743,3 +747,94 @@ void pkgDPkgPM::Reset()
List.erase(List.begin(),List.end());
}
/*}}}*/
+// pkgDpkgPM::WriteApportReport - write out error report pkg failure /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
+{
+ string pkgname, reportfile, srcpkgname, pkgver, arch;
+ string::size_type pos;
+ FILE *report;
+
+ if (_config->FindB("Dpkg::ApportFailureReport",true) == false)
+ return;
+
+ // only report the first error if we are in StopOnError=false mode
+ // to prevent bogus reports
+ if((_config->FindB("Dpkg::StopOnError",true) == false) && pkgFailures > 1)
+ return;
+
+ // get the pkgname and reportfile
+ pkgname = flNotDir(pkgpath);
+ pos = pkgname.rfind('_');
+ if(pos != string::npos)
+ pkgname = string(pkgname, 0, pos);
+
+ // find the package versin and source package name
+ pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname);
+ if (Pkg.end() == true)
+ return;
+ pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
+ pkgver = Ver.VerStr();
+ if (Ver.end() == true)
+ return;
+ pkgRecords Recs(Cache);
+ pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+ srcpkgname = Parse.SourcePkg();
+ if(srcpkgname.empty())
+ srcpkgname = pkgname;
+
+ // if the file exists already, we check:
+ // - if it was reported already (touched by apport).
+ // If not, we do nothing, otherwise
+ // we overwrite it. This is the same behaviour as apport
+ // - if we have a report with the same pkgversion already
+ // then we skip it
+ reportfile = flCombine("/var/crash",pkgname+".0.crash");
+ if(FileExists(reportfile))
+ {
+ struct stat buf;
+ char strbuf[255];
+
+ // check atime/mtime
+ stat(reportfile.c_str(), &buf);
+ if(buf.st_mtime > buf.st_atime)
+ return;
+
+ // check if the existing report is the same version
+ report = fopen(reportfile.c_str(),"r");
+ while(fgets(strbuf, sizeof(strbuf), report) != NULL)
+ {
+ if(strstr(strbuf,"Package:") == strbuf)
+ {
+ char pkgname[255], version[255];
+ if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2)
+ if(strcmp(pkgver.c_str(), version) == 0)
+ {
+ fclose(report);
+ return;
+ }
+ }
+ }
+ fclose(report);
+ }
+
+ // now write the report
+ arch = _config->Find("APT::Architecture");
+ report = fopen(reportfile.c_str(),"w");
+ if(report == NULL)
+ return;
+ if(_config->FindB("DPkgPM::InitialReportOnly",false) == true)
+ chmod(reportfile.c_str(), 0);
+ else
+ chmod(reportfile.c_str(), 0600);
+ fprintf(report, "ProblemType: Package\n");
+ fprintf(report, "Architecture: %s\n", arch.c_str());
+ time_t now = time(NULL);
+ fprintf(report, "Date: %s" , ctime(&now));
+ fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str());
+ fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str());
+ fprintf(report, "ErrorMessage:\n %s\n", errormsg);
+ fclose(report);
+}
+ /*}}}*/
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 7da729904..a413f3a90 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -19,6 +19,7 @@ using std::vector;
class pkgDPkgPM : public pkgPackageManager
{
protected:
+ int pkgFailures;
// used for progress reporting
struct DpkgState
@@ -44,6 +45,9 @@ class pkgDPkgPM : public pkgPackageManager
bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F);
+ // apport integration
+ void WriteApportReport(const char *pkgpath, const char *errormsg);
+
// The Actuall installation implementation
virtual bool Install(PkgIterator Pkg,string File);
virtual bool Configure(PkgIterator Pkg);
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 7f5719454..769bd072e 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1380,3 +1380,4 @@ bool pkgDepCache::Sweep()
return true;
}
+
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 2f15486d9..a209d7477 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -57,6 +57,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::State::lists","lists/");
Cnf.Set("Dir::State::cdroms","cdroms.list");
+ Cnf.Set("Dir::State::mirrors","mirrors/");
// Cache
Cnf.Set("Dir::Cache","var/cache/apt/");
@@ -105,7 +106,6 @@ bool pkgInitConfig(Configuration &Cnf)
bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
}
#endif
-
// Translation
Cnf.Set("APT::Acquire::Translation", "environment");
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index e506de73a..a5dab22ff 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -23,8 +23,8 @@
pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache),
Files(Cache.HeaderP->PackageFileCount)
{
- for (pkgCache::PkgFileIterator I = Cache.FileBegin();
- I.end() == false; I++)
+ for (pkgCache::PkgFileIterator I = Cache.FileBegin();
+ I.end() == false; I++)
{
const pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(I.IndexType());
if (Type == 0)
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 893cb8ee7..0ae6950f3 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -407,6 +407,7 @@ static const char *iTFRewritePackageOrder[] = {
"Section",
"Installed-Size",
"Maintainer",
+ "Original-Maintainer",
"Architecture",
"Source",
"Version",
@@ -436,6 +437,7 @@ static const char *iTFRewriteSourceOrder[] = {"Package",
"Priority",
"Section",
"Maintainer",
+ "Original-Maintainer",
"Build-Depends",
"Build-Depends-Indep",
"Build-Conflicts",
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 95600ff6d..82257a06e 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2115,6 +2115,36 @@ bool DoSource(CommandLine &CmdL)
if (Last == 0)
return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
+ string srec = Last->AsStr();
+ string::size_type pos = srec.find("\nVcs-");
+ while (pos != string::npos)
+ {
+ pos += strlen("\nVcs-");
+ string vcs = srec.substr(pos,srec.find(":",pos)-pos);
+ if(vcs == "Browser")
+ {
+ pos = srec.find("\nVcs-", pos);
+ continue;
+ }
+ pos += vcs.length()+2;
+ string::size_type epos = srec.find("\n", pos);
+ string uri = srec.substr(pos,epos-pos).c_str();
+ ioprintf(c1out, _("WARNING: '%s' is maintained in "
+ "the '%s' version control system at:\n"
+ "%s\n"),
+ Src.c_str(), vcs.c_str(), uri.c_str());
+ if(vcs == "Bzr")
+ ioprintf(c1out,_("Please use:\n"
+ "bzr get %s\n"
+ "to modify the package.\n"),
+ uri.c_str());
+ ioprintf(c1out, "Are you sure you want to continue [yN]? ");
+ if(!YnPrompt(false))
+ return _error->Error(_("Abort."));
+ else
+ break;
+ }
+
// Back track
vector<pkgSrcRecords::File> Lst;
if (Last->Files(Lst) == false)
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 90ecae2cf..7c1aad0cf 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-archive-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure
new file mode 100755
index 000000000..1567e78e3
--- /dev/null
+++ b/cmdline/apt-report-mirror-failure
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import sys
+import urllib
+import apt_pkg
+
+apt_pkg.init()
+url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", None)
+ #"http://people.ubuntu.com:9000/mirror-failure")
+ #"http://localhost:9000/mirror-failure")
+if not url:
+ sys.exit(0)
+
+print "Reporting mirror failure to '%s'" % url
+
+data = {}
+data['mirror'] = sys.argv[1]
+data['failurl'] = sys.argv[2]
+data['error'] = sys.argv[3]
+f = urllib.urlopen(url, urllib.urlencode(data))
+f.read()
+f.close()
+
+
diff --git a/cmdline/makefile b/cmdline/makefile
index 49035be44..2a5bdfbea 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -58,3 +58,9 @@ SOURCE=apt-mark
TO=$(BIN)
TARGET=program
include $(COPY_H)
+
+# The apt-key program
+SOURCE=apt-report-mirror-failure
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)
diff --git a/configure.in b/configure.in
index 9bb1a8baf..e800913b6 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.4")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu8")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 98143ce9a..f77e1cfbf 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -4,5 +4,9 @@ APT
{
"^linux-image.*";
"^linux-restricted-modules.*";
+ "^linux-ubuntu-modules-.*";
};
+
+ Install-Recommends-Section "*metapackages";
+ Never-MarkAuto-Section "*metapackages";
};
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 1543e8bb1..025898e84 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -6,5 +6,6 @@ etc/apt/apt.conf.d
etc/apt/sources.list.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
+var/lib/apt/mirrors/partial
var/lib/apt/periodic
usr/share/bug/apt
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 88fb932df..df0433057 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,11 +17,9 @@ case "$1" in
configure)
if ! test -f /etc/apt/trusted.gpg; then
- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
fi
- apt-key update
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index d18c19d0c..d7e3b73af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-apt (0.7.4) UNRELEASED; urgency=low
+apt (0.7.2ubuntu8) gutsy; urgency=low
[Michael Vogt]
* cmdline/apt-get.cc:
- fix in the task-install code regexp (thanks to Adam Conrad and
- Colin Watson)
+ Colin Watson). This should bring the livecd build back into
+ shape
+
[Otavio Salvador]
- * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
* Fix compilation warnings:
- apt-pkg/contrib/configuration.cc: wrong argument type;
- apt-pkg/deb/dpkgpm.cc: wrong signess;
@@ -17,28 +18,89 @@ apt (0.7.4) UNRELEASED; urgency=low
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100
-apt (0.7.3) unstable; urgency=low
+apt (0.7.2ubuntu7) gutsy; urgency=low
- * fixed compile errors with g++ 4.3 (thanks to
- Daniel Burrows, closes: #429378)
+ * fix build-dependencies
* fixes in the auto-mark code (thanks to Daniel
Burrows)
- * fix FTFBFS by changing build-depends to
- libcurl4-gnutls-dev (closes: #428363)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Jul 2007 19:02:54 +0200
+
+apt (0.7.2ubuntu6) gutsy; urgency=low
+
+ [ Michael Vogt]
+ * cmdline/apt-get.cc:
+ - make the XS-Vcs-$foo warning more copy'n'paste
+ friendly (thanks to Matt Zimmerman)
+ - ignore the Vcs-Browser tag (Fixes LP: #121770)
+ * debian/apt.conf.autoremove:
+ - added "linux-ubuntu-modules" to APT::NeverAutoRemove
+
+ [ Sarah Hobbs ]
+ * Change metapackages to *metapackages in Install-Recommends-Section
+ and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
+ the Recommends of metapackages in universe and multiverse will get
+ installed.
+ * Also make this change in doc/examples/configure-index.
+ * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
+ docbook to fix FTBFS.
+ * Added in previous changelog entries, as those who uploaded did not
+ actually commit to Bzr.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000
+
+apt (0.7.2ubuntu5) gutsy; urgency=low
+
+ * Rerun autoconf to fix the FTBFS.
+
+ -- Michael Bienia <geser@ubuntu.com> Fri, 06 Jul 2007 19:17:33 +0200
+
+apt (0.7.2ubuntu4) gutsy; urgency=low
+
+ * Rebuild for the libcurl4 -> libcurl3 transition mess.
+
+ -- Steve Kowalik <stevenk@ubuntu.com> Fri, 6 Jul 2007 12:44:05 +1000
+
+apt (0.7.2ubuntu3) gutsy; urgency=low
+
* cmdline/apt-get.cc:
- fix InstallTask code when a pkgRecord ends
with a single '\n' (thanks to Soren Hansen for reporting)
- * merged from Christian Perrier:
- * vi.po: completed to 532t, again. Closes: #429899
- * gl.po: completed to 532t. Closes: #429506
- * vi.po: completed to 532t. Closes: #428672
- * Update all PO and the POT. Gives 514t14f4u for formerly
- complete translations
- * fr.po: completed to 532t
- * ku.po, uk.po, LINGUAS: reintegrate those translations
- which disappeared from the BZR repositories
- -- Michael Vogt <mvo@debian.org> Sun, 01 Jul 2007 12:31:29 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200
+
+apt (0.7.2ubuntu2) gutsy; urgency=low
+
+ * fixed compile errors with g++ 4.3 (thanks to
+ Daniel Burrows, closes: #429378)
+ * fix FTFBFS by changing build-depends to
+ libcurl4-gnutls-dev (closes: #428363)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200
+
+apt (0.7.2ubuntu1) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - apport integration added, this means that a apport
+ report is written on dpkg failures
+ * cmdline/apt-get.cc:
+ - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
+ this will warn when Vcs- headers are found on apt-get source
+ (Fixes LP:#115959)
+ * merged from debian/unstable, remaining changes:
+ - maintainer field changed
+ - merged the apt--mirror branch
+ http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
+ - apport reporting on package install/upgrade/remove failure
+ - support for "Originial-Maintainer" field
+ - merged apt--xs-vcs-bzr branch
+ (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
+ - use ubuntu archive keyring by default
+ - debian/apt.conf.autoremove
+ + install recommands for section "metapackages"
+ + do not mark direct dependencies of "metapackages" as autoremoved
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200
apt (0.7.2-0.1) unstable; urgency=low
@@ -106,12 +168,16 @@ apt (0.7.1) experimental; urgency=low
* methods/cdrom.cc:
- only umount if it was mounted by the method before
* po/gl.po:
- - fix error translation that causes trouble to lsb_release
+ - fix error in translation that causes trouble to lsb_release
+ (LP#79165)
* apt-pkg/acquire-item.cc:
- if decompression of a index fails, delete the index
* apt-pkg/acquire.{cc,h}:
- deal better with duplicated sources.list entries (avoid
double queuing of URLs) - this fixes hangs in bzip/gzip
+ (LP#102511)
+ * Fix broken use of awk in apt-key that caused removal of the wrong keys
+ from the keyring. Closes: #412572
* merged from Christian Perrier:
* mr.po: New Marathi translation Closes: #416806
* zh_CN.po: Updated by Eric Pareja Closes: #416822
@@ -133,7 +199,94 @@ apt (0.7.1) experimental; urgency=low
* apt-pkg/policy.cc:
- allow multiple packages (thanks to David Foerster)
- -- Michael Vogt <mvo@debian.org> Wed, 2 May 2007 13:43:44 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 17 Apr 2007 15:53:37 +0200
+
+apt (0.6.46.4ubuntu10) feisty; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added "APT::Never-MarkAuto-Section" and consider dependencies
+ of packages in this section manual (LP#59893)
+ - ensure proper permissions in the extended_state file (LP#67037)
+ * debian/apt.conf.ubuntu:
+ - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
+ * cmdline/apt-get.cc:
+ - "apt-get install foo" on a already installed package foo will
+ clean the automatic installed flag (LP#72007)
+ - do not show packages already marked for removal as auto-installed
+ (LP#64493)
+ - applied patch to (optionally) hide the auto-remove information
+ (thanks to Frode M. Døving) (LP#69148)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100
+
+apt (0.6.46.4ubuntu9) feisty; urgency=low
+
+ * debian/control:
+ - set XS-Vcs-Bzr header
+ - Set Ubuntu maintainer address
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ - only umount if it was mounted by the method before
+ * cmdline/apt-get.cc:
+ - fix version output in autoremove list (LP#68941)
+ * apt-pkg/packagemanager.cc:
+ - do not spin 100% cpu in FixMissing() (LP#84476)
+ * apt-pkg/indexfile.cc:
+ - fix problem overwriting APT::Acquire::Translation
+ * doc/examples/configure-index:
+ - document APT::Acquire::Translation
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100
+
+apt (0.6.46.4ubuntu8) feisty; urgency=low
+
+ * fix segfault in the pkgRecords destructor
+ * Bump ABI version
+ * debian/control:
+ - make the libcurl3-gnutls-dev versionized (LP#86614)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100
+
+apt (0.6.46.4ubuntu7) feisty; urgency=low
+
+ * Merged the apt--mirror branch. This means that a new 'mirror'
+ method is available that will allow dynamic mirror updates.
+ The sources.list entry looks something like this:
+ "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
+
+ It also supports error reporting to a configurable url for mirror
+ problems/failures.
+ * Bump ABI version
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100
+
+apt (0.6.46.4ubuntu6) feisty; urgency=low
+
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/algorithms.cc:
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ - fix segfault (lp: #76530)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100
+
+apt (0.6.46.4ubuntu5) feisty; urgency=low
+
+ * added apt-transport-https package to provide a optional
+ https transport (apt-https spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100
+
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - only increase the score of installed applications if they
+ are not obsolete
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
apt (0.7.0) experimental; urgency=low
@@ -152,6 +305,29 @@ apt (0.7.0) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
+apt (0.6.46.4ubuntu3) feisty; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+ * apt-pkg/depcache.cc:
+ - never mark Required package for autoremoval (lp: #75882)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100
+
+apt (0.6.46.4ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+ (thanks to Ian Jackson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100
+
+apt (0.6.46.4ubuntu1) feisty; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 12:13:14 +0100
+
apt (0.6.46.4-0.1) unstable; urgency=emergency
* NMU
@@ -198,6 +374,26 @@ apt (0.6.46.3-0.1) unstable; urgency=high
-- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 10:34:56 +0000
+apt (0.6.46.3ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+
+ -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000
+
+apt (0.6.46.3ubuntu1) feisty; urgency=low
+
+ * doc/apt-get.8.xml:
+ - documented autoremove, thanks to Vladimír Lapá%Gč%@ek
+ (lp: #62919)
+ * fix broken i18n in the dpkg progress reporting, thanks to
+ Frans Pop and Steinar Gunderson. (closes: #389261)
+ * po/en_GB.po:
+ - typo (lp: #61270)
+ * add apt-secure.8 to "See also" section
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100
+
apt (0.6.46.3) unstable; urgency=low
* apt-pkg/deb/dpkgpm.cc:
@@ -272,10 +468,46 @@ apt (0.6.46) unstable; urgency=low
* debian/control:
- switched to libdb4.4 for building (closes: #381019)
* cmdline/apt-get.cc:
- - show only the recommends/suggests for the candidate-version, not for all
- versions of the package (closes: #257054)
- - properly handle recommends/suggests or-groups when printing the list of
- suggested/recommends packages (closes: #311619)
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu14) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu13) edgy; urgency=low
+
+ * no-changes upload to make apt rebuild against latest g++ and
+ fix synaptic FTBFS (see bug: #62461 for details)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200
+
+apt (0.6.45ubuntu12) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix in the sweep() code, set garbage flag for packages scheduled
+ for removal too
+ - do not change the autoFlag in MarkKeep(), this can lead to suprising
+ side effects
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200
+
+apt (0.6.45ubuntu11) edgy; urgency=low
+
+ * removed "installtask" and change it so that tasknames can be given
+ with "apt-get install taskname^"
+ * improve the writeStateFile() code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200
+
+apt (0.6.45ubuntu10) edgy; urgency=low
+
* methods/http.cc:
- check more careful for incorrect proxy settings (closes: #378868)
* methods/gzip.cc:
@@ -300,8 +532,113 @@ apt (0.6.46) unstable; urgency=low
caseinsensitive (closes: #384182)
- reverted MMap use in the tagfile because it does not work
across pipes (closes: #383487)
+ * added "installtask" command
+ * added new ubuntu specific rewrite rule for "Original-Maintainer"
- -- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200
+
+apt (0.6.45ubuntu9) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - if --no-remove is given, do not run the AutoRemove code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200
+
+apt (0.6.45ubuntu8) edgy; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
+ information (lp: #59457)
+ * cmdline/apt-get.cc:
+ - fix typo in autoremove information (lp: #59420)
+ * install apt-mark to modify the automatically install information for
+ packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200
+
+apt (0.6.45ubuntu7) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix a bug in the install-recommends-section code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200
+
+apt (0.6.45ubuntu6) edgy; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - always show auto-removable packages and give a hint how to remove
+ them
+ * debian/apt.conf.ubuntu:
+ - exlucde linux-image and linux-restricted-modules from ever being
+ auto-removed
+ - added "metapackages" as the section we want to install recommends
+ by default
+ * apt-pkg/depcache.cc:
+ - added support to turn install-recommends selectively on/off by
+ section
+ [Ian Jackson]
+ * Tests pass without code changes! Except that we need this:
+ * Bump cache file major version to force rebuild so that Breaks
+ dependencies are included.
+ * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+ --auto-deconfigure is very very old and dpkg-dev's Breaks support
+ is more or less orthogonal.
+ * Initial draft of `Breaks' implementation. Appears to compile,
+ but as yet *completely untested*.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200
+
+apt (0.6.45ubuntu5) edgy; urgency=low
+
+ * apt-pkg/pkgcachegen.cc:
+ - increase the APT::Cache-Limit to deal with the increased demand due
+ to the translated descriptions
+ * apt-pkg/deb/dpkgpm.cc:
+ - pass "--auto-deconfigure" to dpkg on install to support the
+ new "breaks" in dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200
+
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends (closes: #559000)
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
+
+ * debian/control:
+ - switched to libdb4.4 for building (closes: #381019)
+ * cmdline/apt-get.cc:
+ - show only the recommends/suggests for the candidate-version, not for all
+ versions of the package (closes: #257054)
+ - properly handle recommends/suggests or-groups when printing the list of
+ suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
apt (0.6.45) unstable; urgency=low
@@ -339,42 +676,57 @@ apt (0.6.45) unstable; urgency=low
* dz.po: New Dzongkha translation: 512t
* ro.po: Updated to 512t
* eu.po: Updated
- * eu.po: Updated
- * fix apt-get dist-upgrade
- * fix warning if no /var/lib/apt/extended_states is present
- * don't download Translations for deb-src sources.list lines
- * apt-pkg/tagfile.cc:
- - support not-mmapable files again
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 25 Jul 2006 11:55:22 +0200
+ -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
-apt (0.6.44.2exp1) experimental; urgency=low
+apt (0.6.44.2ubuntu4) edgy; urgency=low
- * added support for i18n of the package descriptions
- * added support for aptitude like auto-install tracking (a HUGE
- HUGE thanks to Daniel Burrows who made this possible)
- * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
- * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
+ * Make apt-get dselect-upgrade happy again
- -- Michael Vogt <mvo@debian.org> Mon, 3 Jul 2006 21:50:31 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200
-apt (0.6.44.2) unstable; urgency=low
+apt (0.6.44.2ubuntu3) edgy; urgency=low
- * apt-pkg/depcache.cc:
- - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
- * apt-pkg/acquire-item.cc:
- - fix missing chmod() in the new aquire code
- (thanks to Bastian Blank, Closes: #367425)
- * merged from
- http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
- * sk.po: Completed to 512t
- * eu.po: Completed to 512t
- * fr.po: Completed to 512t
- * sv.po: Completed to 512t
- * Update all PO and the POT. Gives 506t6f for formerly
- complete translations
+ * Close extended_states file after writing it.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100
+
+apt (0.6.44.2ubuntu2) edgy; urgency=low
+
+ * create a empty extended_states file if none exists already
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200
- -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200
+apt (0.6.44.2ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+ * merged the "auto-mark" branch to support aptitude like
+ marking of automatically installed dependencies and added
+ "apt-get remove --auto-remove" to remove unused auto-installed
+ packages again
+ * changed library version from 3.11 to 3.50 to make it clearly
+ different from the debian version (we are ABI incompatible because
+ of the auto-mark patch)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200
+
+apt (0.6.44.2) unstable; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+ * apt-pkg/acquire-item.cc:
+ - fix missing chmod() in the new aquire code
+ (thanks to Bastian Blank, Closes: #367425)
+ * merged from
+ http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+ * sk.po: Completed to 512t
+ * eu.po: Completed to 512t
+ * fr.po: Completed to 512t
+ * sv.po: Completed to 512t
+ * Update all PO and the POT. Gives 506t6f for formerly
+ complete translations
+
+ -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200
apt (0.6.44.1-0.1) unstable; urgency=low
@@ -436,6 +788,26 @@ apt (0.6.44) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200
+apt (0.6.43.3ubuntu3) dapper; urgency=low
+
+ * methods/http.cc:
+ - fix the user-agent string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200
+
+apt (0.6.43.3ubuntu2) dapper; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200
+
+apt (0.6.43.3ubuntu1) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in
+ the status-fd (ubuntu #28954)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200
+
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@ -445,16 +817,46 @@ apt (0.6.43.3) unstable; urgency=low
* pl.po: Completed to 512t. Closes: #349514
* sk.po: Completed to 512t. Closes: #349474
* gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
* sv.po: Completed to 512 strings Closes: #349210
* ru.po: Completed to 512 strings Closes: #349154
* da.po: Completed to 512 strings Closes: #349084
* fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
* vi.po: Completed to 511 strings Closes: #348968
- * zh_CN.po: Completed to 512t. Closes: #353936
- * it.po: Completed to 512t. Closes: #352803
- * pt_BR.po: Completed to 512t. Closes: #352419
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
* LINGUAS: Add Welsh
* *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
* apt-pkg/deb/deblistparser.cc:
- don't explode on a DepCompareOp in a Provides line, but warn about
it and ignore it otherwise (thanks to James Troup for reporting it)
@@ -465,8 +867,10 @@ apt (0.6.43.3) unstable; urgency=low
* make apt-cache madison work without deb-src entries (#352583)
* cmdline/apt-get.cc: only run the list-cleaner if a update was
successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
- -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
apt (0.6.43.2) unstable; urgency=low
@@ -491,8 +895,26 @@ apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
-apt (0.6.43.1) unstable; urgency=low
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+apt (0.6.43.1) unstable; urgency=low
+
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
* fr.po: Completed to 510 strings
* it.po: Completed to 510t
@@ -514,6 +936,19 @@ apt (0.6.43.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
@@ -534,6 +969,22 @@ apt (0.6.43) unstable; urgency=medium
-- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
apt (0.6.42.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -581,13 +1032,13 @@ apt (0.6.42) unstable; urgency=low
- unmount the cdrom when apt failed to locate any package files
* allow cdrom failures and fallback to other sources in that case
(closes: #44135)
- * better error text when dpkg-source fails
+ * better error text when dpkg-source fails
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
- patch-99: Added Galician translation
- patch-100: Completed Danish translation (Closes: #325686)
- patch-104: French translation completed
- patch-109: Italian translation completed
- - patch-112: Swedish translation update
+ - patch-112: Swedish translation update
- patch-115: Basque translation completed (Closes: #333299)
* applied french man-page update (thanks to Philippe Batailler)
(closes: #316638, #327456)
@@ -601,9 +1052,9 @@ apt (0.6.42) unstable; urgency=low
* apt-pkg/contrib/md5.cc:
- fix a alignment problem on sparc64 that gives random bus errors
(thanks to Fabbione for providing a test-case)
- * init the default ScreenWidth to 79 columns by default
+ * init the default ScreenWidth to 79 columns by default
(Closes: #324921)
- * cmdline/apt-cdrom.cc:
+ * cmdline/apt-cdrom.cc:
- fix some missing gettext() calls (closes: #334539)
* doc/apt-cache.8.xml: fix typo (closes: #334714)
@@ -614,8 +1065,8 @@ apt (0.6.41) unstable; urgency=low
* improved the support for "error" and "conffile" reporting from
dpkg, added the format to README.progress-reporting
* added README.progress-reporting to the apt-doc package
- * improved the network timeout handling, if a index file from a
- sources.list times out or EAI_AGAIN is returned from getaddrinfo,
+ * improved the network timeout handling, if a index file from a
+ sources.list times out or EAI_AGAIN is returned from getaddrinfo,
don't try to get the other files from that entry
* Support architecture-specific extra overrides
(closes: #225947). Thanks to Anthony Towns for idea and
@@ -623,10 +1074,10 @@ apt (0.6.41) unstable; urgency=low
* Javier Fernandez-Sanguino Pen~a:
- Added a first version of an apt-secure.8 manpage, and modified
apt-key and apt.end accordingly. Also added the 'update'
- argument to apt-key which was previously not documented
+ argument to apt-key which was previously not documented
(Closes: #322120)
* Andreas Pakulat:
- - added example apt-ftparchive.conf file to doc/examples
+ - added example apt-ftparchive.conf file to doc/examples
(closes: #322483)
* Fix a incorrect example in the man-page (closes: #282918)
* Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
@@ -635,10 +1086,84 @@ apt (0.6.41) unstable; urgency=low
* Change pkgPolicy::Pin from private to protected to let subclasses
access it too (closes: #321799)
* add default constructor for PrvIterator (closes: #322267)
- * Reread status configuration on debSystem::Initialize()
+ * Reread status configuration on debSystem::Initialize()
(needed for apt-proxy, thanks to Otavio for this patch)
-
+
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
@@ -649,6 +1174,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -664,6 +1195,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -674,7 +1238,14 @@ apt (0.6.39) unstable; urgency=low
* Update priority of apt-utils to important, to match the override file
* Install only one keyring on each branch (Closes: #316119)
- -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
apt (0.6.38) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7939e1bca..e2ab8ec4e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,22 @@
Source: apt
Section: admin
Priority: important
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
Standards-Version: 3.7.2.2
Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
-XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
+XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring
+Depends: ${shlibs:Depends}
Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2
+Recommends: ubuntu-keyring
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
Section: admin
Description: Advanced front-end for dpkg
This is Debian's next generation front-end for the dpkg package manager.
diff --git a/debian/rules b/debian/rules
index 3ebecfba4..daf15fe1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,7 +210,7 @@ apt: build debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
- cp share/debian-archive.gpg debian/$@/usr/share/$@
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
# head -n 500 ChangeLog > debian/ChangeLog
@@ -219,6 +219,10 @@ apt: build debian/shlibs.local
rm -f build/po/*.pot
rm -f po/*.pot
+ # move the mirror failure script in place
+ mv debian/$@/usr/bin/apt-report-mirror-failure \
+ debian/$@/usr/lib/apt/apt-report-mirror-failure \
+
dh_installexamples -p$@ $(BLD)/docs/examples/*
dh_installman -p$@
dh_installcron -p$@
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index d0aad1e3d..ef2c10631 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -97,11 +97,14 @@ APT
// consider Recommends, Suggests as important dependencies that should
// be installed by default
- APT::Install-Recommends "false";
- APT::Install-Suggests "false";
+ Install-Recommends "false";
+ Install-Suggests "false";
+ // install recommends automatically for packages in this section
+ Install-Recommends-Section "*metapackages";
+
// consider dependencies of packages in this section manual
- Never-MarkAuto-Section "metapackages";
+ Never-MarkAuto-Section "*metapackages";
// Write progress messages on this fd (for stuff like base-config)
Status-Fd "-1";
@@ -186,6 +189,20 @@ Acquire
{
Options {"--ignore-time-conflict";} // not very usefull on a normal system
};
+
+ mirror
+ {
+ RefreshInterval "360"; // refresh interval in minutes
+ MaxAge "90"; // max age for a mirror file in days before
+ // it gets deleted
+ // mirror failure reporting script
+ ProblemReporting "/usr/lib/apt/apt-report-mirror-failure";
+ // mirror failure reporting url
+ ReportFailures "http://example.com/mirror-failure";
+ };
+
+ // translations can be set here to "none", "environment" or "$locale"
+ Translation "none";
};
// Directory layout
@@ -199,6 +216,7 @@ Dir "/"
userstatus "status.user";
status "/var/lib/dpkg/status";
cdroms "cdroms.list";
+ mirrors "mirrors/";
};
// Location of the cache dir
@@ -289,9 +307,9 @@ Debug
Acquire::Http "false"; // Show http command traffic
Acquire::Https "false"; // Show https debug
Acquire::gpgv "false"; // Show the gpgv traffic
+ Acquire::Mirror "false"; // Show debugging of the mirror method
aptcdrom "false"; // Show found package files
IdentCdrom "false";
-
}
/* Whatever you do, do not use this configuration file!! Take out ONLY
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9af1c3c4c..a958899ae 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,9 +1,11 @@
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu dapper main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+deb http://security.ubuntu.com/ubuntu dapper-security main restricted
+deb-src http://security.ubuntu.com/ubuntu dapper-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
diff --git a/methods/connect.cc b/methods/connect.cc
index 8c2ac6d56..145001fb3 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
+#include <sstream>
// Internet stuff
#include <netinet/in.h>
@@ -67,12 +68,10 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
wrong this will get tacked onto the end of the error message */
if (LastHostAddr->ai_next != 0)
{
- char Name2[NI_MAXHOST + NI_MAXSERV + 10];
- snprintf(Name2,sizeof(Name2),_("[IP: %s %s]"),Name,Service);
- Owner->SetFailExtraMsg(string(Name2));
- }
- else
- Owner->SetFailExtraMsg("");
+ std::stringstream ss;
+ ioprintf(ss, _("[IP: %s %s]"),Name,Service);
+ Owner->SetIP(ss.str());
+ }
// Get a socket
if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,
@@ -89,7 +88,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
/* This implements a timeout for connect by opening the connection
nonblocking */
if (WaitFd(Fd,true,TimeOut) == false) {
- Owner->SetFailExtraMsg("\nFailReason: Timeout");
+ Owner->SetFailReason("Timeout");
return _error->Error(_("Could not connect to %s:%s (%s), "
"connection timed out"),Host.c_str(),Service,Name);
}
@@ -104,7 +103,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
{
errno = Err;
if(errno == ECONNREFUSED)
- Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
+ Owner->SetFailReason("ConnectionRefused");
return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
Service,Name);
}
@@ -164,12 +163,13 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
DefPort = 0;
continue;
}
+ Owner->SetFailReason("ResolveFailure");
return _error->Error(_("Could not resolve '%s'"),Host.c_str());
}
if (Res == EAI_AGAIN)
{
- Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure");
+ Owner->SetFailReason("TmpResolveFailure");
return _error->Error(_("Temporary failure resolving '%s'"),
Host.c_str());
}
diff --git a/methods/http.cc b/methods/http.cc
index 3c2d8a36f..7001b217a 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -38,7 +38,6 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <iostream>
#include <apti18n.h>
// Internet stuff
@@ -715,7 +714,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
- Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
+ Req += "User-Agent: Ubuntu APT-HTTP/1.3 ("VERSION")\r\n\r\n";
if (Debug == true)
cerr << Req << endl;
@@ -916,6 +915,9 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
failure */
if (Srv->Result < 200 || Srv->Result >= 300)
{
+ char err[255];
+ snprintf(err,sizeof(err)-1,"HttpError%i",Srv->Result);
+ SetFailReason(err);
_error->Error("%u %s",Srv->Result,Srv->Code);
if (Srv->HaveContent == true)
return 4;
@@ -991,7 +993,7 @@ void HttpMethod::SigTerm(int)
depth. */
bool HttpMethod::Fetch(FetchItem *)
{
- if (Server == 0)
+ if (Server == 0)
return true;
// Queue the requests
@@ -1224,13 +1226,5 @@ int HttpMethod::Loop()
}
/*}}}*/
-int main()
-{
- setlocale(LC_ALL, "");
-
- HttpMethod Mth;
-
- return Mth.Loop();
-}
diff --git a/methods/http.h b/methods/http.h
index 6753a9901..dec5cd80f 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -13,7 +13,7 @@
#define MAXLEN 360
-#include <iostream>
+
using std::cout;
using std::endl;
@@ -134,7 +134,6 @@ class HttpMethod : public pkgAcqMethod
bool ServerDie(ServerState *Srv);
int DealWithHeaders(FetchResult &Res,ServerState *Srv);
- virtual bool Fetch(FetchItem *);
virtual bool Configuration(string Message);
// In the event of a fatal signal this file will be closed and timestamped.
@@ -142,6 +141,9 @@ class HttpMethod : public pkgAcqMethod
static int FailFd;
static time_t FailTime;
static void SigTerm(int);
+
+ protected:
+ virtual bool Fetch(FetchItem *);
public:
friend class ServerState;
diff --git a/methods/http_main.cc b/methods/http_main.cc
new file mode 100644
index 000000000..2c46ab19d
--- /dev/null
+++ b/methods/http_main.cc
@@ -0,0 +1,15 @@
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/acquire-method.h>
+
+#include "connect.h"
+#include "rfc2553emu.h"
+#include "http.h"
+
+
+int main()
+{
+ setlocale(LC_ALL, "");
+
+ HttpMethod Mth;
+ return Mth.Loop();
+}
diff --git a/methods/makefile b/methods/makefile
index f178cbbea..83bd8c7c9 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -49,7 +49,14 @@ include $(PROGRAM_H)
PROGRAM=http
SLIBS = -lapt-pkg $(SOCKETLIBS)
LIB_MAKES = apt-pkg/makefile
-SOURCE = http.cc rfc2553emu.cc connect.cc
+SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
+# The https method
+PROGRAM=https
+SLIBS = -lapt-pkg -lcurl
+LIB_MAKES = apt-pkg/makefile
+SOURCE = https.cc
include $(PROGRAM_H)
# The https method
@@ -80,6 +87,13 @@ LIB_MAKES = apt-pkg/makefile
SOURCE = rsh.cc
include $(PROGRAM_H)
+# The mirror method
+PROGRAM=mirror
+SLIBS = -lapt-pkg $(SOCKETLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
# SSH and vzip2 method symlink
binary: $(BIN)/ssh $(BIN)/bzip2
veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2
diff --git a/methods/mirror.cc b/methods/mirror.cc
new file mode 100644
index 000000000..9fe64fd70
--- /dev/null
+++ b/methods/mirror.cc
@@ -0,0 +1,282 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
+/* ######################################################################
+
+ Mirror Aquire Method - This is the Mirror aquire method for APT.
+
+ ##################################################################### */
+ /*}}}*/
+// Include Files /*{{{*/
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/sourcelist.h>
+
+#include <fstream>
+#include <iostream>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+using namespace std;
+
+#include "mirror.h"
+#include "http.h"
+#include "apti18n.h"
+ /*}}}*/
+
+/* Done:
+ * - works with http (only!)
+ * - always picks the first mirror from the list
+ * - call out to problem reporting script
+ * - supports "deb mirror://host/path/to/mirror-list/// dist component"
+ * - uses pkgAcqMethod::FailReason() to have a string representation
+ * of the failure that is also send to LP
+ *
+ * TODO:
+ * - deal with runing as non-root because we can't write to the lists
+ dir then -> use the cached mirror file
+ * - better method to download than having a pkgAcquire interface here
+ * and better error handling there!
+ * - support more than http
+ * - testing :)
+ */
+
+MirrorMethod::MirrorMethod()
+ : HttpMethod(), HasMirrorFile(false)
+{
+};
+
+// HttpMethod::Configuration - Handle a configuration message /*{{{*/
+// ---------------------------------------------------------------------
+/* We stash the desired pipeline depth */
+bool MirrorMethod::Configuration(string Message)
+{
+ if (pkgAcqMethod::Configuration(Message) == false)
+ return false;
+ Debug = _config->FindB("Debug::Acquire::mirror",false);
+
+ return true;
+}
+ /*}}}*/
+
+// clean the mirrors dir based on ttl information
+bool MirrorMethod::Clean(string Dir)
+{
+ vector<metaIndex *>::const_iterator I;
+
+ if(Debug)
+ clog << "MirrorMethod::Clean(): " << Dir << endl;
+
+ // read sources.list
+ pkgSourceList list;
+ list.ReadMainList();
+
+ DIR *D = opendir(Dir.c_str());
+ if (D == 0)
+ return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+
+ string StartDir = SafeGetCWD();
+ if (chdir(Dir.c_str()) != 0)
+ {
+ closedir(D);
+ return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
+ }
+
+ for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
+ {
+ // Skip some files..
+ if (strcmp(Dir->d_name,"lock") == 0 ||
+ strcmp(Dir->d_name,"partial") == 0 ||
+ strcmp(Dir->d_name,".") == 0 ||
+ strcmp(Dir->d_name,"..") == 0)
+ continue;
+
+ // see if we have that uri
+ for(I=list.begin(); I != list.end(); I++)
+ {
+ string uri = (*I)->GetURI();
+ if(uri.substr(0,strlen("mirror://")) != string("mirror://"))
+ continue;
+ string BaseUri = uri.substr(0,uri.size()-1);
+ if (URItoFileName(BaseUri) == Dir->d_name)
+ break;
+ }
+ // nothing found, nuke it
+ if (I == list.end())
+ unlink(Dir->d_name);
+ };
+
+ chdir(StartDir.c_str());
+ closedir(D);
+ return true;
+}
+
+
+bool MirrorMethod::GetMirrorFile(string mirror_uri_str)
+{
+ /*
+ - a mirror_uri_str looks like this:
+ mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors/dists/feisty/Release.gpg
+
+ - the matching source.list entry
+ deb mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors feisty main
+
+ - we actually want to go after:
+ http://people.ubuntu.com/~mvo/apt/mirror/mirrors
+
+ And we need to save the BaseUri for later:
+ - mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors
+
+ FIXME: what if we have two similar prefixes?
+ mirror://people.ubuntu.com/~mvo/mirror
+ mirror://people.ubuntu.com/~mvo/mirror2
+ then mirror_uri_str looks like:
+ mirror://people.ubuntu.com/~mvo/apt/mirror/dists/feisty/Release.gpg
+ mirror://people.ubuntu.com/~mvo/apt/mirror2/dists/feisty/Release.gpg
+ we search sources.list and find:
+ mirror://people.ubuntu.com/~mvo/apt/mirror
+ in both cases! So we need to apply some domain knowledge here :( and
+ check for /dists/ or /Release.gpg as suffixes
+ */
+ if(Debug)
+ std::cerr << "GetMirrorFile: " << mirror_uri_str << std::endl;
+
+ // read sources.list and find match
+ vector<metaIndex *>::const_iterator I;
+ pkgSourceList list;
+ list.ReadMainList();
+ for(I=list.begin(); I != list.end(); I++)
+ {
+ string uristr = (*I)->GetURI();
+ if(Debug)
+ std::cerr << "Checking: " << uristr << std::endl;
+ if(uristr.substr(0,strlen("mirror://")) != string("mirror://"))
+ continue;
+ // find matching uri in sources.list
+ if(mirror_uri_str.substr(0,uristr.size()) == uristr)
+ {
+ if(Debug)
+ std::cerr << "found BaseURI: " << uristr << std::endl;
+ BaseUri = uristr.substr(0,uristr.size()-1);
+ }
+ }
+ string fetch = BaseUri;
+ fetch.replace(0,strlen("mirror://"),"http://");
+
+ // get new file
+ MirrorFile = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri);
+
+ if(Debug)
+ {
+ cerr << "base-uri: " << BaseUri << endl;
+ cerr << "mirror-file: " << MirrorFile << endl;
+ }
+
+ // check the file, if it is not older than RefreshInterval just use it
+ // otherwise try to get a new one
+ if(FileExists(MirrorFile))
+ {
+ struct stat buf;
+ time_t t,now,refresh;
+ if(stat(MirrorFile.c_str(), &buf) != 0)
+ return false;
+ t = std::max(buf.st_mtime, buf.st_ctime);
+ now = time(NULL);
+ refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360);
+ if(t + refresh > now)
+ {
+ if(Debug)
+ clog << "Mirror file is in RefreshInterval" << endl;
+ HasMirrorFile = true;
+ return true;
+ }
+ if(Debug)
+ clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl;
+ }
+
+ // not that great to use pkgAcquire here, but we do not have
+ // any other way right now
+ pkgAcquire Fetcher;
+ new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
+ bool res = (Fetcher.Run() == pkgAcquire::Continue);
+ if(res)
+ HasMirrorFile = true;
+ Fetcher.Shutdown();
+ return res;
+}
+
+bool MirrorMethod::SelectMirror()
+{
+ // FIXME: make the mirror selection more clever, do not
+ // just use the first one!
+ ifstream in(MirrorFile.c_str());
+ getline(in, Mirror);
+ if(Debug)
+ cerr << "Using mirror: " << Mirror << endl;
+
+ UsedMirror = Mirror;
+ return true;
+}
+
+// MirrorMethod::Fetch - Fetch an item /*{{{*/
+// ---------------------------------------------------------------------
+/* This adds an item to the pipeline. We keep the pipeline at a fixed
+ depth. */
+bool MirrorMethod::Fetch(FetchItem *Itm)
+{
+ // select mirror only once per session
+ if(!HasMirrorFile)
+ {
+ Clean(_config->FindDir("Dir::State::mirrors"));
+ GetMirrorFile(Itm->Uri);
+ SelectMirror();
+ }
+
+ for (FetchItem *I = Queue; I != 0; I = I->Next)
+ {
+ if(I->Uri.find("mirror://") != string::npos)
+ I->Uri.replace(0,BaseUri.size(),Mirror);
+ }
+
+ // now run the real fetcher
+ return HttpMethod::Fetch(Itm);
+};
+
+void MirrorMethod::Fail(string Err,bool Transient)
+{
+ if(Queue->Uri.find("http://") != string::npos)
+ Queue->Uri.replace(0,Mirror.size(), BaseUri);
+ pkgAcqMethod::Fail(Err, Transient);
+}
+
+void MirrorMethod::URIStart(FetchResult &Res)
+{
+ if(Queue->Uri.find("http://") != string::npos)
+ Queue->Uri.replace(0,Mirror.size(), BaseUri);
+ pkgAcqMethod::URIStart(Res);
+}
+
+void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
+{
+ if(Queue->Uri.find("http://") != string::npos)
+ Queue->Uri.replace(0,Mirror.size(), BaseUri);
+ pkgAcqMethod::URIDone(Res, Alt);
+}
+
+
+int main()
+{
+ setlocale(LC_ALL, "");
+
+ MirrorMethod Mth;
+
+ return Mth.Loop();
+}
+
+
diff --git a/methods/mirror.h b/methods/mirror.h
new file mode 100644
index 000000000..798f5a9b5
--- /dev/null
+++ b/methods/mirror.h
@@ -0,0 +1,51 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
+// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
+/* ######################################################################
+
+ MIRROR Aquire Method - This is the MIRROR aquire method for APT.
+
+ ##################################################################### */
+ /*}}}*/
+
+#ifndef APT_MIRROR_H
+#define APT_MIRROR_H
+
+
+#include <iostream>
+
+using std::cout;
+using std::cerr;
+using std::endl;
+
+#include "http.h"
+
+class MirrorMethod : public HttpMethod
+{
+ FetchResult Res;
+ // we simply transform between BaseUri and Mirror
+ string BaseUri; // the original mirror://... url
+ string Mirror; // the selected mirror uri (http://...)
+ string MirrorFile; //
+ bool HasMirrorFile;
+
+ bool Debug;
+
+ protected:
+ bool GetMirrorFile(string uri);
+ bool SelectMirror();
+ bool Clean(string dir);
+
+ // we need to overwrite those to transform the url back
+ virtual void Fail(string Why, bool Transient = false);
+ virtual void URIStart(FetchResult &Res);
+ virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+ virtual bool Configuration(string Message);
+
+ public:
+ MirrorMethod();
+ virtual bool Fetch(FetchItem *Itm);
+};
+
+
+#endif
diff --git a/mirror-failure.py b/mirror-failure.py
new file mode 100644
index 000000000..e7d2bbf54
--- /dev/null
+++ b/mirror-failure.py
@@ -0,0 +1,23 @@
+# File: cgihttpserver-example-1.py
+
+import CGIHTTPServer
+import BaseHTTPServer
+
+class Handler(CGIHTTPServer.CGIHTTPRequestHandler):
+ #cgi_directories = ["/cgi"]
+ def do_POST(self):
+ print "do_POST"
+ #print self.command
+ #print self.path
+ #print self.headers
+ print self.client_address
+ data = self.rfile.read(int(self.headers["content-length"]))
+ print data
+ self.wfile.write("200 Ok\n");
+
+PORT = 8000
+
+httpd = BaseHTTPServer.HTTPServer(("", PORT), Handler)
+print "serving at port", PORT
+httpd.serve_forever()
+
diff --git a/po/ChangeLog b/po/ChangeLog
index 40dc6d8ee..930feedc0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,26 +1,3 @@
-2007-06-19 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: completed to 532t, again. Closes: #429899
-
-2007-06-19 Jacobo Tarrío <jtarrio@debian.org>
-
- * gl.po: completed to 532t. Closes: #429506
-
-2007-06-13 Clytie Siddall <clytie@riverland.net.au>
-
- * vi.po: completed to 532t. Closes: #428672
-
-2007-06-12 Christian Perrier <bubulle@debian.org>
-
- * Update all PO and the POT. Gives 514t14f4u for formerly
- complete translations
- * fr.po: completed to 532t
-
-2007-06-12 Christian Perrier <bubulle@debian.org>
-
- * ku.po, uk.po, LINGUAS: reintegrate those translations
- which disappeared from the BZR repositories
-
2007-06-01 Clytie Siddall <clytie@riverland.net.au>
* vi.po: Updated to 515t. Closes: #426976
diff --git a/po/LINGUAS b/po/LINGUAS
index 24fc64ef2..eaf179bd7 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-bg bs ca cs cy da de el en_GB es eu fi fr gl he hu it ja ko ku nb nl nn pl pt pt_BR ro ru sk sl sv tl uk vi zh_CN zh_TW
+bg bs ca cs cy da de el en_GB es eu fi fr gl he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d1d6c7622..76f85a538 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-11 23:19+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+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"
@@ -156,7 +156,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -554,7 +554,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -713,11 +713,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -772,7 +772,7 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -789,7 +789,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr ""
@@ -915,7 +915,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -927,37 +927,37 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, c-format
msgid "%s set to manual installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -965,159 +965,174 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1373,7 +1388,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1665,7 +1680,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1692,39 +1707,39 @@ msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
@@ -1796,76 +1811,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr ""
@@ -2000,6 +2015,7 @@ msgid "Unable to stat the mount point %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2432,41 +2448,41 @@ msgstr ""
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, 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:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr ""
@@ -2572,60 +2588,60 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
-
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
diff --git a/po/ar.po b/po/ar.po
deleted file mode 100644
index 8a0b74706..000000000
--- a/po/ar.po
+++ /dev/null
@@ -1,2566 +0,0 @@
-# translation of apt_po.po to Arabic
-# This file is put in the public domain.
-#
-# Ossama M. Khayat <okhayat@yahoo.com>, 2005, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: apt_po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-10-20 21:28+0300\n"
-"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
-"Language-Team: Arabic <support@arabeyes.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Arabic\n"
-"X-Poedit-Country: Lebanon\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: cmdline/apt-cache.cc:135
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n"
-
-#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-cache.cc:232
-msgid "Total package names : "
-msgstr "أسماء الحزم الكلية :"
-
-#: cmdline/apt-cache.cc:272
-msgid " Normal packages: "
-msgstr " الحزم العادية:"
-
-#: cmdline/apt-cache.cc:273
-msgid " Pure virtual packages: "
-msgstr "الحزمة الوهمية تماماً:"
-
-#: cmdline/apt-cache.cc:274
-msgid " Single virtual packages: "
-msgstr " الحزمة الوهمية المفردة:"
-
-#: cmdline/apt-cache.cc:275
-msgid " Mixed virtual packages: "
-msgstr " الحزم الوهمية المختلطة:"
-
-#: cmdline/apt-cache.cc:276
-msgid " Missing: "
-msgstr " مفقودة:"
-
-#: cmdline/apt-cache.cc:278
-msgid "Total distinct versions: "
-msgstr "مجموع النسخ الفريدة:"
-
-#: cmdline/apt-cache.cc:280
-msgid "Total dependencies: "
-msgstr "مجموع المعتمدات:"
-
-#: cmdline/apt-cache.cc:283
-msgid "Total ver/file relations: "
-msgstr "مجموع علاقات النسخ/الملفات:"
-
-#: cmdline/apt-cache.cc:285
-msgid "Total Provides mappings: "
-msgstr "مجموع علاقات النسخ/الملفات:"
-
-#: cmdline/apt-cache.cc:297
-msgid "Total globbed strings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:311
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:316
-msgid "Total slack space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:324
-msgid "Total space accounted for: "
-msgstr "مجموع المساحة المحسوب حسابها:"
-
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
-#, c-format
-msgid "Package file %s is out of sync."
-msgstr ""
-
-#: cmdline/apt-cache.cc:1231
-msgid "You must give exactly one pattern"
-msgstr "يجب أن تعطي صيغة واحدة بالضبط"
-
-#: cmdline/apt-cache.cc:1385
-msgid "No packages found"
-msgstr "لم يُعثر على أية حزم"
-
-#: cmdline/apt-cache.cc:1462
-msgid "Package files:"
-msgstr "ملفات الحزم:"
-
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1470
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1482
-msgid "Pinned packages:"
-msgstr "الحزم المُدبّسة:"
-
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
-msgid "(not found)"
-msgstr "(غير موجود)"
-
-#. Installed version
-#: cmdline/apt-cache.cc:1515
-msgid " Installed: "
-msgstr " مُثبّت:"
-
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
-msgid "(none)"
-msgstr "(لاشيء)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1522
-msgid " Candidate: "
-msgstr " مرشّح: "
-
-#: cmdline/apt-cache.cc:1532
-msgid " Package pin: "
-msgstr ""
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc:1541
-msgid " Version table:"
-msgstr " جدول النسخ:"
-
-#: cmdline/apt-cache.cc:1556
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
-#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
-
-#: cmdline/apt-cache.cc:1659
-msgid ""
-"Usage: apt-cache [options] command\n"
-" apt-cache [options] add file1 [file2 ...]\n"
-" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
-"\n"
-"Commands:\n"
-" add - Add a package file to the source cache\n"
-" gencaches - Build both the package and source cache\n"
-" showpkg - Show some general information for a single package\n"
-" showsrc - Show source records\n"
-" stats - Show some basic statistics\n"
-" dump - Show the entire file in a terse form\n"
-" dumpavail - Print an available file to stdout\n"
-" unmet - Show unmet dependencies\n"
-" search - Search the package list for a regex pattern\n"
-" show - Show a readable record for the package\n"
-" depends - Show raw dependency information for a package\n"
-" rdepends - Show reverse dependency information for a package\n"
-" pkgnames - List the names of all packages\n"
-" dotty - Generate package graphs for GraphVis\n"
-" xvcg - Generate package graphs for xvcg\n"
-" policy - Show policy settings\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -p=? The package cache.\n"
-" -s=? The source cache.\n"
-" -q Disable progress indicator.\n"
-" -i Show only important deps for the unmet command.\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'"
-
-#: cmdline/apt-cdrom.cc:93
-msgid "Please insert a Disc in the drive and press enter"
-msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter"
-
-#: cmdline/apt-cdrom.cc:117
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة."
-
-#: cmdline/apt-config.cc:41
-msgid "Arguments not in pairs"
-msgstr ""
-
-#: cmdline/apt-config.cc:76
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-" shell - Shell mode\n"
-" dump - Show the configuration\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s ليس حزمة DEB صالحة."
-
-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -t Set the temp dir\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
-#, c-format
-msgid "Unable to write to %s"
-msgstr "تعذرت الكتابة إلى %s"
-
-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
-
-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
-msgid "Package extension list is too long"
-msgstr "قائمة توسيعات الحزمة طويلة جداً"
-
-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
-#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
-#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
-#, c-format
-msgid "Error processing directory %s"
-msgstr "خطأ في معالجة الدليل %s"
-
-#: ftparchive/apt-ftparchive.cc:254
-msgid "Source extension list is too long"
-msgstr "قائمة توسيعات المصدر طويلة جداً"
-
-#: ftparchive/apt-ftparchive.cc:371
-msgid "Error writing header to contents file"
-msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
-
-#: ftparchive/apt-ftparchive.cc:401
-#, c-format
-msgid "Error processing contents %s"
-msgstr "خطأ في معالجة المحتويات %s"
-
-#: ftparchive/apt-ftparchive.cc:556
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" --md5 Control MD5 generation\n"
-" -s=? Source override file\n"
-" -q Quiet\n"
-" -d=? Select the optional caching database\n"
-" --no-delink Enable delinking debug mode\n"
-" --contents Control contents file generation\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:762
-msgid "No selections matched"
-msgstr "لم تُطابق أية تحديدات"
-
-#: ftparchive/apt-ftparchive.cc:835
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
-
-#: ftparchive/cachedb.cc:47
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:81
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:242
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:448
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:79
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: تعذرت قراءة الدليل %s\n"
-
-#: ftparchive/writer.cc:84
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:135
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:137
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:144
-msgid "E: Errors apply to file "
-msgstr ""
-
-#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
-#, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:173
-msgid "Tree walking failed"
-msgstr ""
-
-#: ftparchive/writer.cc:198
-#, c-format
-msgid "Failed to open %s"
-msgstr "فشل فتح %s"
-
-#: ftparchive/writer.cc:257
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:265
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:269
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:276
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** فشل ربط %s بـ%s"
-
-#: ftparchive/writer.cc:286
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:390
-msgid "Archive had no package field"
-msgstr ""
-
-#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
-#, c-format
-msgid " %s has no override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
-#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:623
-#, c-format
-msgid " %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:627
-#, c-format
-msgid " %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:317
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "خطأ داخلي، تعذر العثور على العضو %s"
-
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - فشل تعيين الذاكرة"
-
-#: ftparchive/override.cc:38 ftparchive/override.cc:146
-#, c-format
-msgid "Unable to open %s"
-msgstr "تعذر فتح %s"
-
-#: ftparchive/override.cc:64 ftparchive/override.cc:170
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr ""
-
-#: ftparchive/override.cc:78 ftparchive/override.cc:182
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr ""
-
-#: ftparchive/override.cc:92 ftparchive/override.cc:195
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr ""
-
-#: ftparchive/override.cc:131 ftparchive/override.cc:205
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:75
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
-
-#: ftparchive/multicompress.cc:105
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
-
-#: ftparchive/multicompress.cc:198
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:201
-msgid "Failed to fork"
-msgstr ""
-
-#: ftparchive/multicompress.cc:215
-msgid "Compress child"
-msgstr ""
-
-#: ftparchive/multicompress.cc:238
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "خطأ داخلي، تعذر إنشاء %s"
-
-#: ftparchive/multicompress.cc:289
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:324
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:363
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:406
-msgid "IO to subprocess/file failed"
-msgstr ""
-
-#: ftparchive/multicompress.cc:458
-msgid "Failed to read while computing MD5"
-msgstr ""
-
-#: ftparchive/multicompress.cc:475
-#, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "فشل تغيير اسم %s إلى %s"
-
-#: cmdline/apt-get.cc:120
-msgid "Y"
-msgstr "Y"
-
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:237
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: cmdline/apt-get.cc:327
-#, c-format
-msgid "but %s is installed"
-msgstr "إلا أن %s مثبت"
-
-#: cmdline/apt-get.cc:329
-#, c-format
-msgid "but %s is to be installed"
-msgstr "إلا أنه سيتم تثبيت %s"
-
-#: cmdline/apt-get.cc:336
-msgid "but it is not installable"
-msgstr "إلا أنه غير قابل للتثبيت"
-
-#: cmdline/apt-get.cc:338
-msgid "but it is a virtual package"
-msgstr "إلا أنها حزمة وهمية"
-
-#: cmdline/apt-get.cc:341
-msgid "but it is not installed"
-msgstr "إلا أنها غير مثبتة"
-
-#: cmdline/apt-get.cc:341
-msgid "but it is not going to be installed"
-msgstr "إلا أنه لن يتم تثبيتها"
-
-#: cmdline/apt-get.cc:346
-msgid " or"
-msgstr " أو"
-
-#: cmdline/apt-get.cc:375
-msgid "The following NEW packages will be installed:"
-msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: cmdline/apt-get.cc:401
-msgid "The following packages will be REMOVED:"
-msgstr "سيتم إزالة الحزم التالية:"
-
-#: cmdline/apt-get.cc:423
-msgid "The following packages have been kept back:"
-msgstr "سيتم الإبقاء على الحزم التالية:"
-
-#: cmdline/apt-get.cc:444
-msgid "The following packages will be upgraded:"
-msgstr "ستتم ترقية الحزم التالية:"
-
-#: cmdline/apt-get.cc:465
-msgid "The following packages will be DOWNGRADED:"
-msgstr "سيتم تثبيط الحزم التالية:"
-
-#: cmdline/apt-get.cc:485
-msgid "The following held packages will be changed:"
-msgstr "سيتم تغيير الحزم المبقاة التالية:"
-
-#: cmdline/apt-get.cc:538
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (بسبب %s) "
-
-#: cmdline/apt-get.cc:546
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
-"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-
-#: cmdline/apt-get.cc:577
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-
-#: cmdline/apt-get.cc:581
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu أعيد تثبيتها، "
-
-#: cmdline/apt-get.cc:583
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu مثبطة، "
-
-#: cmdline/apt-get.cc:585
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-
-#: cmdline/apt-get.cc:589
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
-
-#: cmdline/apt-get.cc:649
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: cmdline/apt-get.cc:652
-msgid " failed."
-msgstr " فشل."
-
-#: cmdline/apt-get.cc:655
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: cmdline/apt-get.cc:658
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: cmdline/apt-get.cc:660
-msgid " Done"
-msgstr " تم"
-
-#: cmdline/apt-get.cc:664
-msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه."
-
-#: cmdline/apt-get.cc:667
-msgid "Unmet dependencies. Try using -f."
-msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
-
-#: cmdline/apt-get.cc:689
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
-
-#: cmdline/apt-get.cc:693
-msgid "Authentication warning overridden.\n"
-msgstr "تم غض النظر عن تحذير المصادقة.\n"
-
-#: cmdline/apt-get.cc:700
-msgid "Install these packages without verification [y/N]? "
-msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
-
-#: cmdline/apt-get.cc:702
-msgid "Some packages could not be authenticated"
-msgstr "تعذرت المصادقة على بعض الحزم"
-
-#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
-msgid "There are problems and -y was used without --force-yes"
-msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
-
-#: cmdline/apt-get.cc:755
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
-
-#: cmdline/apt-get.cc:764
-msgid "Packages need to be removed but remove is disabled."
-msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
-
-#: cmdline/apt-get.cc:775
-msgid "Internal error, Ordering didn't finish"
-msgstr "خطأ داخلي، لم تنته عملية الترتيب"
-
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
-msgid "Unable to lock the download directory"
-msgstr "تعذر قَفْل دليل التنزيل"
-
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
-#: apt-pkg/cachefile.cc:67
-msgid "The list of sources could not be read."
-msgstr "تعذرت قراءة قائمة المصادر."
-
-#: cmdline/apt-get.cc:816
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
-
-#: cmdline/apt-get.cc:821
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
-
-#: cmdline/apt-get.cc:824
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
-
-#: cmdline/apt-get.cc:829
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
-
-#: cmdline/apt-get.cc:832
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
-
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "تعذر حساب المساحة الحرة في %s"
-
-#: cmdline/apt-get.cc:849
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "ليس هناك مساحة كافية في %s."
-
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#: cmdline/apt-get.cc:866
-msgid "Yes, do as I say!"
-msgstr "نعم، افعل ما أقوله!"
-
-#: cmdline/apt-get.cc:868
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"أنت على وشك أن تقوم بشيء ضارّ جداً\n"
-"كي تستمر اكتب العبارة '%s'\n"
-" ؟] "
-
-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
-msgid "Abort."
-msgstr "إجهاض."
-
-#: cmdline/apt-get.cc:889
-msgid "Do you want to continue [Y/n]? "
-msgstr "هل تريد الاستمرار [Y/n]؟"
-
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
-#, c-format
-msgid "Failed to fetch %s %s\n"
-msgstr "فشل إحضار %s %s\n"
-
-#: cmdline/apt-get.cc:979
-msgid "Some files failed to download"
-msgstr "فشل تنزيل بعض الملفات"
-
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
-msgid "Download complete and in download only mode"
-msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
-
-#: cmdline/apt-get.cc:986
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
-"fix-missing؟"
-
-#: cmdline/apt-get.cc:990
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
-
-#: cmdline/apt-get.cc:995
-msgid "Unable to correct missing packages."
-msgstr "تعذر تصحيح الحزم المفقودة."
-
-#: cmdline/apt-get.cc:996
-msgid "Aborting install."
-msgstr "إجهاض التثبيت."
-
-#: cmdline/apt-get.cc:1030
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: cmdline/apt-get.cc:1040
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: cmdline/apt-get.cc:1058
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-
-#: cmdline/apt-get.cc:1069
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "الحزمة %s وهميّة وتوفّرها:\n"
-
-#: cmdline/apt-get.cc:1081
-msgid " [Installed]"
-msgstr " [مُثبّتة]"
-
-#: cmdline/apt-get.cc:1086
-msgid "You should explicitly select one to install."
-msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
-
-#: cmdline/apt-get.cc:1091
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1110
-msgid "However the following packages replace it:"
-msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
-
-#: cmdline/apt-get.cc:1113
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "الحزمة %s ليس لها مرشح تثبيت"
-
-#: cmdline/apt-get.cc:1133
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
-
-#: cmdline/apt-get.cc:1141
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s هي النسخة الأحدث.\n"
-
-#: cmdline/apt-get.cc:1168
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
-
-#: cmdline/apt-get.cc:1170
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-
-#: cmdline/apt-get.cc:1176
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-
-#: cmdline/apt-get.cc:1313
-msgid "The update command takes no arguments"
-msgstr "لا يقبل الأمر update أية مُعطيات"
-
-#: cmdline/apt-get.cc:1326
-msgid "Unable to lock the list directory"
-msgstr "تعذر قفل دليل القائمة"
-
-#: cmdline/apt-get.cc:1384
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: cmdline/apt-get.cc:1403
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: cmdline/apt-get.cc:1516
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
-
-#: cmdline/apt-get.cc:1546
-msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
-
-#: cmdline/apt-get.cc:1549
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-
-#: cmdline/apt-get.cc:1561
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: cmdline/apt-get.cc:1569
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-
-#: cmdline/apt-get.cc:1574
-msgid "The following information may help to resolve the situation:"
-msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
-
-#: cmdline/apt-get.cc:1577
-msgid "Broken packages"
-msgstr "حزم معطوبة"
-
-#: cmdline/apt-get.cc:1603
-msgid "The following extra packages will be installed:"
-msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
-
-#: cmdline/apt-get.cc:1692
-msgid "Suggested packages:"
-msgstr "الحزم المقترحة:"
-
-#: cmdline/apt-get.cc:1693
-msgid "Recommended packages:"
-msgstr "الحزم المستحسنة:"
-
-#: cmdline/apt-get.cc:1713
-msgid "Calculating upgrade... "
-msgstr "حساب الترقية..."
-
-#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
-msgid "Failed"
-msgstr "فشل"
-
-#: cmdline/apt-get.cc:1721
-msgid "Done"
-msgstr "تمّ"
-
-#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
-msgid "Internal error, problem resolver broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1894
-msgid "Must specify at least one package to fetch source for"
-msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-
-#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "تعذر العثور على مصدر الحزمة %s"
-
-#: cmdline/apt-get.cc:1968
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
-
-#: cmdline/apt-get.cc:1992
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "ليس هناك مساحة كافية في %s"
-
-#: cmdline/apt-get.cc:1997
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
-
-#: cmdline/apt-get.cc:2000
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-
-#: cmdline/apt-get.cc:2006
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "إحضار المصدر %s\n"
-
-#: cmdline/apt-get.cc:2037
-msgid "Failed to fetch some archives."
-msgstr "فشل إحضار بعض الأرشيفات."
-
-#: cmdline/apt-get.cc:2065
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2077
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "أمر فك الحزمة '%s' فشل.\n"
-
-#: cmdline/apt-get.cc:2078
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2095
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "أمر البناء '%s' فشل.\n"
-
-#: cmdline/apt-get.cc:2114
-msgid "Child process failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2130
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2158
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2178
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2230
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc:2282
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc:2317
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc:2342
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2356
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc:2360
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:2392
-msgid "Supported modules:"
-msgstr "الوحدات المدعومة:"
-
-#: cmdline/apt-get.cc:2433
-msgid ""
-"Usage: apt-get [options] command\n"
-" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-" apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-" update - Retrieve new lists of packages\n"
-" upgrade - Perform an upgrade\n"
-" install - Install new packages (pkg is libc6 not libc6.deb)\n"
-" remove - Remove packages\n"
-" source - Download source archives\n"
-" build-dep - Configure build-dependencies for source packages\n"
-" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-" dselect-upgrade - Follow dselect selections\n"
-" clean - Erase downloaded archive files\n"
-" autoclean - Erase old downloaded archive files\n"
-" check - Verify that there are no broken dependencies\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -q Loggable output - no progress indicator\n"
-" -qq No output except for errors\n"
-" -d Download only - do NOT install or unpack archives\n"
-" -s No-act. Perform ordering simulation\n"
-" -y Assume Yes to all queries and do not prompt\n"
-" -f Attempt to continue if the integrity check fails\n"
-" -m Attempt to continue if archives are unlocatable\n"
-" -u Show a list of upgraded packages as well\n"
-" -b Build the source package after fetching it\n"
-" -V Show verbose version numbers\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-" This APT has Super Cow Powers.\n"
-msgstr ""
-
-#: cmdline/acqprogress.cc:55
-msgid "Hit "
-msgstr ""
-
-#: cmdline/acqprogress.cc:79
-msgid "Get:"
-msgstr "جلب:"
-
-#: cmdline/acqprogress.cc:110
-msgid "Ign "
-msgstr "تجاهل"
-
-#: cmdline/acqprogress.cc:114
-msgid "Err "
-msgstr "خطأ"
-
-#: cmdline/acqprogress.cc:135
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "جلب %sب في %s (%sب/ث)\n"
-
-#: cmdline/acqprogress.cc:225
-#, c-format
-msgid " [Working]"
-msgstr " [يعمل]"
-
-#: cmdline/acqprogress.cc:271
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"تغيير الوسط: الرجاء إدخال القرص المُسمّى\n"
-" '%s'\n"
-"في السوّاقة '%s' وضغط مفتاح الإدخال\n"
-
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr "سجل حزمة مجهول!"
-
-#: cmdline/apt-sortpkgs.cc:150
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -s Use source file sorting\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "إعداد افتراضيّ سيّء!"
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
-msgid "Press enter to continue."
-msgstr "اضغط مفتاح الإدخال للاستمرار."
-
-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة "
-
-#: dselect/install:101
-msgid "packages that were installed. This may result in duplicate errors"
-msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة"
-
-#: dselect/install:102
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء"
-
-#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً"
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr "دمج المعلومات المتوفرة"
-
-#: apt-inst/contrib/extracttar.cc:117
-msgid "Failed to create pipes"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:144
-msgid "Failed to exec gzip "
-msgstr "فشل تنفيذ gzip"
-
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
-msgid "Corrupted archive"
-msgstr "أرشيف فاسد"
-
-#: apt-inst/contrib/extracttar.cc:196
-msgid "Tar checksum failed, archive corrupted"
-msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
-
-#: apt-inst/contrib/extracttar.cc:299
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:73
-msgid "Invalid archive signature"
-msgstr "توقيع الأرشيف غير صالح"
-
-#: apt-inst/contrib/arfile.cc:81
-msgid "Error reading archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
-msgid "Invalid archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:131
-msgid "Archive is too short"
-msgstr "الأرشيف قصير جداً"
-
-#: apt-inst/contrib/arfile.cc:135
-msgid "Failed to read the archive headers"
-msgstr "فشلت قراءة ترويسات الأرشيف"
-
-#: apt-inst/filelist.cc:384
-msgid "DropNode called on still linked node"
-msgstr ""
-
-#: apt-inst/filelist.cc:416
-msgid "Failed to locate the hash element!"
-msgstr ""
-
-#: apt-inst/filelist.cc:463
-msgid "Failed to allocate diversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:468
-msgid "Internal error in AddDiversion"
-msgstr "خطأ داخلي في AddDiversion"
-
-#: apt-inst/filelist.cc:481
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
-
-#: apt-inst/filelist.cc:510
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr ""
-
-#: apt-inst/filelist.cc:553
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "ملف تهيئة مُزدوج %s/%s"
-
-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed to write file %s"
-msgstr "فشلت كتابة الملف %s"
-
-#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
-#, c-format
-msgid "Failed to close file %s"
-msgstr "فشل إغلاق الملف %s"
-
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
-#, c-format
-msgid "The path %s is too long"
-msgstr "المسار %s طويل جداً"
-
-#: apt-inst/extract.cc:127
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "فكّ تحزيم %s أكثر من مرّة"
-
-#: apt-inst/extract.cc:137
-#, c-format
-msgid "The directory %s is diverted"
-msgstr ""
-
-#: apt-inst/extract.cc:147
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
-
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
-msgid "The diversion path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:243
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-
-#: apt-inst/extract.cc:283
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
-
-#: apt-inst/extract.cc:287
-msgid "The path is too long"
-msgstr "المسار طويل جداً"
-
-#: apt-inst/extract.cc:417
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr ""
-
-#: apt-inst/extract.cc:434
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
-
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
-#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
-#, c-format
-msgid "Unable to read %s"
-msgstr "تعذرت قراءة %s"
-
-#: apt-inst/extract.cc:494
-#, c-format
-msgid "Unable to stat %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
-#, c-format
-msgid "Failed to remove %s"
-msgstr "تعذرت إزالة %s"
-
-#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
-#, c-format
-msgid "Unable to create %s"
-msgstr "تعذر إنشاء %s"
-
-#: apt-inst/deb/dpkgdb.cc:118
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:123
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr ""
-
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
-msgid "Reading package lists"
-msgstr "قراءة قوائم الحزم"
-
-#: apt-inst/deb/dpkgdb.cc:180
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
-#: apt-inst/deb/dpkgdb.cc:448
-msgid "Internal error getting a package name"
-msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة"
-
-#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file listing"
-msgstr "قراءة سرد الملفات"
-
-#: apt-inst/deb/dpkgdb.cc:216
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "فشلت قراءة ملف القائمة %sinfo/%s"
-
-#: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal error getting a node"
-msgstr "خطأ داخلي أثناء الحصول على node"
-
-#: apt-inst/deb/dpkgdb.cc:309
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:324
-msgid "The diversion file is corrupted"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
-#: apt-inst/deb/dpkgdb.cc:341
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal error adding a diversion"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:443
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:465
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:470
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:52
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:112
-#, c-format
-msgid "Couldn't change to %s"
-msgstr "تعذر التغيير إلى %s"
-
-#: apt-inst/deb/debfile.cc:138
-msgid "Internal error, could not locate member"
-msgstr "خطأ داخلي، تعذر العثور على العضو"
-
-#: apt-inst/deb/debfile.cc:171
-msgid "Failed to locate a valid control file"
-msgstr "فشل العثور على ملف تحكّم صالح"
-
-#: apt-inst/deb/debfile.cc:256
-msgid "Unparsable control file"
-msgstr ""
-
-#: methods/cdrom.cc:114
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "تعذرت قراءة قاعدة بيانات القرص المدمج %s"
-
-#: methods/cdrom.cc:123
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"الرجاء استخدام apt-cdrom لتعريف APT بهذا القرص المدمج. لا يمكن استخدام apt-"
-"get update لإضافة أقراص مدمجة جديدة."
-
-#: methods/cdrom.cc:131
-msgid "Wrong CD-ROM"
-msgstr "القرص المدمج الخطأ"
-
-#: methods/cdrom.cc:164
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام."
-
-#: methods/cdrom.cc:169
-msgid "Disk not found."
-msgstr "لم يُعثر على القرص."
-
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "لم يُعثر على الملف"
-
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150
-msgid "Failed to stat"
-msgstr "فشيل تنفيذ stat"
-
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
-msgid "Failed to set modification time"
-msgstr "فشل تعيين وقت التعديل"
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
-msgid "Logging in"
-msgstr "تسجيل الدخول"
-
-#: methods/ftp.cc:168
-msgid "Unable to determine the peer name"
-msgstr ""
-
-#: methods/ftp.cc:173
-msgid "Unable to determine the local name"
-msgstr ""
-
-#: methods/ftp.cc:204 methods/ftp.cc:232
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "رفض الخادم اتصالنا بالرد: %s"
-
-#: methods/ftp.cc:210
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "فشل USER، ردّ الخادم: %s"
-
-#: methods/ftp.cc:217
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "فشل PASS، ردّ الخادم: %s"
-
-#: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin "
-"فارغ."
-
-#: methods/ftp.cc:265
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s"
-
-#: methods/ftp.cc:291
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "فشل TYPE، ردّ الخادم: %s"
-
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "انتهى وقت الاتصال"
-
-#: methods/ftp.cc:335
-msgid "Server closed the connection"
-msgstr "أغلق الخادم الاتصال"
-
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
-msgid "Read error"
-msgstr "خطأ في القراءة"
-
-#: methods/ftp.cc:345 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr ""
-
-#: methods/ftp.cc:362 methods/ftp.cc:374
-msgid "Protocol corruption"
-msgstr ""
-
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
-msgid "Write error"
-msgstr "خطأ في الكتابة"
-
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
-msgid "Could not create a socket"
-msgstr ""
-
-#: methods/ftp.cc:698
-msgid "Could not connect data socket, connection timed out"
-msgstr ""
-
-#: methods/ftp.cc:704
-msgid "Could not connect passive socket."
-msgstr ""
-
-#: methods/ftp.cc:722
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
-
-#: methods/ftp.cc:736
-msgid "Could not bind a socket"
-msgstr ""
-
-#: methods/ftp.cc:740
-msgid "Could not listen on the socket"
-msgstr ""
-
-#: methods/ftp.cc:747
-msgid "Could not determine the socket's name"
-msgstr ""
-
-#: methods/ftp.cc:779
-msgid "Unable to send PORT command"
-msgstr "تعذر إرسال الأمر PORT"
-
-#: methods/ftp.cc:789
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr ""
-
-#: methods/ftp.cc:798
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "فشل EPRT، ردّ الخادم: %s"
-
-#: methods/ftp.cc:818
-msgid "Data socket connect timed out"
-msgstr ""
-
-#: methods/ftp.cc:825
-msgid "Unable to accept connection"
-msgstr "تعذر قبول الاتصال"
-
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr ""
-
-#: methods/ftp.cc:877
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "تعذر إحضار الملف، ردّ الخادم '%s'"
-
-#: methods/ftp.cc:892 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr ""
-
-#: methods/ftp.cc:922
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "فشل نقل البيانات، ردّ الخادم '%s'"
-
-#. Get the files information
-#: methods/ftp.cc:997
-msgid "Query"
-msgstr "استعلام"
-
-#: methods/ftp.cc:1109
-msgid "Unable to invoke "
-msgstr ""
-
-#: methods/connect.cc:64
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "الاتصال بـ%s (%s)"
-
-#: methods/connect.cc:71
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
-
-#: methods/connect.cc:80
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
-
-#: methods/connect.cc:86
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
-
-#: methods/connect.cc:93
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
-
-#: methods/connect.cc:108
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "تعذر الاتصال بـ%s:%s (%s)."
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "الاتصال بـ%s"
-
-#: methods/connect.cc:167
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr ""
-
-#: methods/connect.cc:173
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr ""
-
-#: methods/connect.cc:176
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr ""
-
-#: methods/connect.cc:223
-#, c-format
-msgid "Unable to connect to %s %s:"
-msgstr "تعذر الاتصال بـ%s %s:"
-
-#: methods/gpgv.cc:65
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr ""
-
-#: methods/gpgv.cc:100
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:204
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:209
-msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#: methods/gpgv.cc:213
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr ""
-
-#: methods/gpgv.cc:218
-msgid "Unknown error executing gpgv"
-msgstr ""
-
-#: methods/gpgv.cc:249
-msgid "The following signatures were invalid:\n"
-msgstr ""
-
-#: methods/gpgv.cc:256
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
-#: methods/http.cc:376
-msgid "Waiting for headers"
-msgstr "بانتظار الترويسات"
-
-#: methods/http.cc:522
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr ""
-
-#: methods/http.cc:530
-msgid "Bad header line"
-msgstr "سطر ترويسة سيء"
-
-#: methods/http.cc:549 methods/http.cc:556
-msgid "The HTTP server sent an invalid reply header"
-msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
-
-#: methods/http.cc:585
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
-
-#: methods/http.cc:600
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
-
-#: methods/http.cc:602
-msgid "This HTTP server has broken range support"
-msgstr "خادم http له دعم مدى معطوب"
-
-#: methods/http.cc:626
-msgid "Unknown date format"
-msgstr "نسق تاريخ مجهول"
-
-#: methods/http.cc:773
-msgid "Select failed"
-msgstr "فشل التحديد"
-
-#: methods/http.cc:778
-msgid "Connection timed out"
-msgstr "انتهى وقت الاتصال"
-
-#: methods/http.cc:801
-msgid "Error writing to output file"
-msgstr "خطأ في الكتابة إلى ملف المُخرجات"
-
-#: methods/http.cc:832
-msgid "Error writing to file"
-msgstr "خطأ في الكتابة إلى الملف"
-
-#: methods/http.cc:860
-msgid "Error writing to the file"
-msgstr "خطأ في الكتابة إلى الملف"
-
-#: methods/http.cc:874
-msgid "Error reading from server. Remote end closed connection"
-msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
-
-#: methods/http.cc:876
-msgid "Error reading from server"
-msgstr "خطأ في القراءة من الخادم"
-
-#: methods/http.cc:1107
-msgid "Bad header data"
-msgstr "بيانات ترويسة سيئة"
-
-#: methods/http.cc:1124
-msgid "Connection failed"
-msgstr "فشل الاتصال"
-
-#: methods/http.cc:1215
-msgid "Internal error"
-msgstr "خطأ داخلي"
-
-#: apt-pkg/contrib/mmap.cc:82
-msgid "Can't mmap an empty file"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:87
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:938
-#, c-format
-msgid "Selection %s not found"
-msgstr "تعذر العثور على التحديد %s"
-
-#: apt-pkg/contrib/configuration.cc:436
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "اختصار نوع مجهول: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:494
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "فتح ملف التهيئة %s"
-
-#: apt-pkg/contrib/configuration.cc:512
-#, c-format
-msgid "Line %d too long (max %d)"
-msgstr "السطر %d طويل جداً (أقصاه %d)"
-
-#: apt-pkg/contrib/configuration.cc:608
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:627
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:644
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:684
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:691
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:704
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:738
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:154
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... خطأ!"
-
-#: apt-pkg/contrib/progress.cc:156
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... تمّ"
-
-#: apt-pkg/contrib/cmndline.cc:80
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "خيار سطر الأمر '%c' [من %s] مجهول."
-
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "خيار سطر الأمر %s غير مفهوم"
-
-#: apt-pkg/contrib/cmndline.cc:127
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "الخيار %s يتطلّب مُعطى."
-
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:237
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:268
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "الخيار '%s' طويل جداً"
-
-#: apt-pkg/contrib/cmndline.cc:301
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:351
-#, c-format
-msgid "Invalid operation %s"
-msgstr "عمليّة غير صالحة %s"
-
-#: apt-pkg/contrib/cdromutl.cc:55
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
-#, c-format
-msgid "Unable to change to %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:190
-msgid "Failed to stat the cdrom"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:82
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:87
-#, c-format
-msgid "Could not open lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:105
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:109
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:377
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:387
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:390
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:392
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:436
-#, c-format
-msgid "Could not open file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:492
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:522
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:597
-msgid "Problem closing the file"
-msgstr "مشكلة في إغلاق الملف"
-
-#: apt-pkg/contrib/fileutl.cc:603
-msgid "Problem unlinking the file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:614
-msgid "Problem syncing the file"
-msgstr "مشكلة في مزامنة الملف"
-
-#: apt-pkg/pkgcache.cc:126
-msgid "Empty package cache"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:132
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:137
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:142
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:147
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:218
-msgid "Depends"
-msgstr "يعتمد"
-
-#: apt-pkg/pkgcache.cc:218
-msgid "PreDepends"
-msgstr "يعتمد مسبقاً"
-
-#: apt-pkg/pkgcache.cc:218
-msgid "Suggests"
-msgstr "يستحسن"
-
-#: apt-pkg/pkgcache.cc:219
-msgid "Recommends"
-msgstr "يقترح"
-
-#: apt-pkg/pkgcache.cc:219
-msgid "Conflicts"
-msgstr "يعارض"
-
-#: apt-pkg/pkgcache.cc:219
-msgid "Replaces"
-msgstr "يستبدل"
-
-#: apt-pkg/pkgcache.cc:220
-msgid "Obsoletes"
-msgstr "يُلغي"
-
-#: apt-pkg/pkgcache.cc:231
-msgid "important"
-msgstr "مهم"
-
-#: apt-pkg/pkgcache.cc:231
-msgid "required"
-msgstr "مطلوب"
-
-#: apt-pkg/pkgcache.cc:231
-msgid "standard"
-msgstr "قياسي"
-
-#: apt-pkg/pkgcache.cc:232
-msgid "optional"
-msgstr "اختياري"
-
-#: apt-pkg/pkgcache.cc:232
-msgid "extra"
-msgstr "إضافي"
-
-#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:62
-msgid "Candidate versions"
-msgstr ""
-
-#: apt-pkg/depcache.cc:91
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:106
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:193
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:94
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:96
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:99
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:105
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:112
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:203
-#, c-format
-msgid "Opening %s"
-msgstr "فتح %s"
-
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:240
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:244
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:402
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:37
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/algorithms.cc:241
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1059
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1061
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-
-#: apt-pkg/acquire.cc:62
-#, c-format
-msgid "Lists directory %spartial is missing."
-msgstr ""
-
-#: apt-pkg/acquire.cc:66
-#, c-format
-msgid "Archive directory %spartial is missing."
-msgstr ""
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:823
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:825
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:162
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:377
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-
-#: apt-pkg/init.cc:120
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "نظام الحزم '%s' غير مدعوم"
-
-#: apt-pkg/init.cc:136
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/clean.cc:61
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:48
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/cachefile.cc:73
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-
-#: apt-pkg/cachefile.cc:77
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
-
-#: apt-pkg/policy.cc:269
-msgid "Invalid record in the preferences file, no Package header"
-msgstr ""
-
-#: apt-pkg/policy.cc:291
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:299
-msgid "No priority (or zero) specified for pin"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:74
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:129
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
-
-#: apt-pkg/pkgcachegen.cc:150
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
-
-#: apt-pkg/pkgcachegen.cc:154
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:184
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:188
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:192
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:207
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:210
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:213
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:241
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:254
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:574
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:658
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:126
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum غير متطابقة"
-
-#: apt-pkg/acquire-item.cc:640
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:753
-#, 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:812
-#, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:848
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:935
-msgid "Size mismatch"
-msgstr "الحجم غير متطابق"
-
-#: apt-pkg/vendorlist.cc:66
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:507
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
-msgid "Identifying.. "
-msgstr "جاري التعرف..."
-
-#: apt-pkg/cdrom.cc:541
-#, c-format
-msgid "Stored label: %s \n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:561
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:579
-msgid "Unmounting CD-ROM\n"
-msgstr "فك تركيب القرص المدمج\n"
-
-#: apt-pkg/cdrom.cc:583
-msgid "Waiting for disc...\n"
-msgstr "بانتظار القرص...\n"
-
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
-msgid "Mounting CD-ROM...\n"
-msgstr "تركيب القرص...\n"
-
-#: apt-pkg/cdrom.cc:609
-msgid "Scanning disc for index files..\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:647
-#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:710
-msgid "That is not a valid name, try again.\n"
-msgstr "هذا الاسم غير صالح، حاول مجدداً.\n"
-
-#: apt-pkg/cdrom.cc:726
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-"هذا القرص مسمى: \n"
-"'%s'\n"
-
-#: apt-pkg/cdrom.cc:730
-msgid "Copying package lists..."
-msgstr "نسخ قوائم الحزم..."
-
-#: apt-pkg/cdrom.cc:754
-msgid "Writing new source list\n"
-msgstr "كتابة لائحة المصادر الجديدة\n"
-
-#: apt-pkg/cdrom.cc:763
-msgid "Source list entries for this disc are:\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "فك تركيب القرص المدمج..."
-
-#: apt-pkg/indexcopy.cc:261
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:263
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:266
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:269
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:358
-#, c-format
-msgid "Preparing %s"
-msgstr "تحضير %s"
-
-#: apt-pkg/deb/dpkgpm.cc:359
-#, c-format
-msgid "Unpacking %s"
-msgstr "فتح %s"
-
-#: apt-pkg/deb/dpkgpm.cc:364
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "التحضير لتهيئة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:365
-#, c-format
-msgid "Configuring %s"
-msgstr "تهيئة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:366
-#, c-format
-msgid "Installed %s"
-msgstr "تم تثبيت %s"
-
-#: apt-pkg/deb/dpkgpm.cc:371
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "التحضير لإزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:372
-#, c-format
-msgid "Removing %s"
-msgstr "إزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:373
-#, c-format
-msgid "Removed %s"
-msgstr "تم إزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "التحضير لإزالة %s بالكامل"
-
-#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Completely removed %s"
-msgstr "تمت إزالة %s بالكامل"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
-
-#~ msgid "File date has changed %s"
-#~ msgstr "تغير تاريخ الملف %s"
diff --git a/po/bg.po b/po/bg.po
index cbf1a2a65..e39057bf7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 20:14+0300\n"
"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s за %s %s, компилиран на %s %s\n"
@@ -664,7 +664,7 @@ msgstr "Неуспех при преименуването на %s на %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -827,11 +827,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
@@ -861,7 +861,7 @@ msgstr "След разпакетирането ще бъде използван
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
@@ -890,7 +890,7 @@ msgstr ""
"За да продължите, въведете фразата „%s“\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Прекъсване."
@@ -898,7 +898,7 @@ msgstr "Прекъсване."
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -907,7 +907,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n"
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
@@ -1041,7 +1041,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
"Следната информация може да помогне за намиране на изход от ситуацията:"
@@ -1055,31 +1055,31 @@ msgstr "Вътрешна грешка, „problem resolver“ счупи нещ
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "но ще бъде инсталиран %s"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1087,7 +1087,7 @@ msgstr ""
"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1099,7 +1099,7 @@ msgstr ""
"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
"са били преместени от Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1109,118 +1109,133 @@ msgstr ""
"да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
"доклад за грешка за този пакет."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Счупени пакети"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Неуспех"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Нямате достатъчно свободно пространство в %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1244,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,32 +1254,32 @@ msgstr ""
"налични версии на пакета %s, които могат да удовлетворят изискването за "
"версия"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1574,9 +1589,9 @@ msgstr "Файловете се заменят със съдържанието
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s заменя този в пакет %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Неуспех при четенето на %s"
@@ -1878,7 +1893,7 @@ msgstr "Времето за установяване на връзка с гне
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
@@ -1905,39 +1920,39 @@ msgstr "Запитване"
msgid "Unable to invoke "
msgstr "Неуспех при извикването на "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Свързване с %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Не може да се започне свързване с %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Неуспех при свързване с %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Свързване с %s"
@@ -2017,76 +2032,76 @@ msgstr "Неуспех при отварянето на програмен ка
msgid "Read error from %s process"
msgstr "Грешка при четене от процес %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Чакане на заглавни части"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен е един ред на заглавна част с над %u символа"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Невалиден ред на заглавна част"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Вътрешна грешка"
@@ -2104,59 +2119,59 @@ msgstr "Неуспех при прехвърлянето в паметта на
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Неизвестен тип на абревиатура: „%c“"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Отваряне на конфигурационен файл %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Ред %d е твърде дълъг (максимум %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
"ниво"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
@@ -2223,6 +2238,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Неуспех при преминаването в %s"
@@ -2477,7 +2493,7 @@ msgstr ""
"пакет %s. Това често е лошо, но ако наистина искате да го направите, "
"активирайте опцията APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Не се поддържа индексен файл от типа „%s“"
@@ -2598,7 +2614,7 @@ msgstr "Възникна грешка при обработката на %s (Use
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2628,7 +2644,7 @@ msgstr "Възникна грешка при обработката на %s (New
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2680,21 +2696,21 @@ msgstr "Събиране на информация за „Осигурява“
msgid "IO Error saving source cache"
msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2703,7 +2719,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2712,14 +2728,14 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Несъответствие на размера"
@@ -2832,52 +2848,52 @@ msgstr "Записани са %i записа с %i несъответстващ
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Подготвяне на %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Разпакетиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготвяне на %s за конфигуриране"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Конфигуриране на %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s е инсталиран"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготвяне за премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s е премахнат"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка за пълно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
diff --git a/po/bs.po b/po/bs.po
index 10dca043e..cb8c0c446 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+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"
@@ -157,7 +157,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -568,7 +568,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -729,11 +729,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
@@ -762,7 +762,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -788,7 +788,7 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Odustani."
@@ -797,7 +797,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -806,7 +806,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr ""
@@ -933,7 +933,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -945,37 +945,37 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -983,159 +983,174 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1389,9 +1404,9 @@ msgstr ""
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
@@ -1686,7 +1701,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1713,39 +1728,39 @@ msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Povezujem se sa %s"
@@ -1818,76 +1833,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1905,57 +1920,57 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:509
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %d)"
+msgid "Line %d too long (max %u)"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2022,6 +2037,7 @@ msgid "Unable to stat the mount point %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2266,7 +2282,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
@@ -2379,7 +2395,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:153
#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:178
@@ -2409,7 +2425,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:245
#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:251
@@ -2456,41 +2472,41 @@ msgstr ""
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, 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:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr ""
@@ -2599,52 +2615,52 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se sa %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Preporučuje"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
diff --git a/po/ca.po b/po/ca.po
index 7abb92988..e74602a17 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-02-05 22:00+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per a %s %s compilat el %s %s\n"
@@ -657,7 +657,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -820,11 +820,11 @@ msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
@@ -854,7 +854,7 @@ msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -883,7 +883,7 @@ msgstr ""
"Per a continuar escriviu la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Avortat."
@@ -891,7 +891,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -900,7 +900,7 @@ msgstr "No s'ha pogut obtenir %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
@@ -1036,7 +1036,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
@@ -1050,31 +1050,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "però s'instal·larà %s"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1082,7 +1082,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1094,7 +1094,7 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1104,120 +1104,135 @@ msgstr ""
"probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n"
"un informe d'error en contra d'aquest per a arxivar-lo."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a descarregar"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1241,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1250,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1572,9 +1587,9 @@ msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -1876,7 +1891,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1903,39 +1918,39 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "No es pot invocar"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "S'està connectant amb %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No s'ha pogut connectar amb %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "S'està connectant amb %s"
@@ -2015,76 +2030,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
msgid "Read error from %s process"
msgstr "Error llegint des del procés %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor http té el suport d'abast trencat"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Error intern"
@@ -2102,57 +2117,57 @@ msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreujament de tipus no reconegut: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "S'està obrint el fitxer de configuració %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Línia %d massa llarga (màx %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Error sintàctic %s:%u: No comença el camp amb un nom."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Error sintàctic %s:%u: Etiqueta malformada"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Error sintàctic %s:%u Text extra després del valor"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Error sintàctic %s:%u: Inclusió des d'aqui"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error sintàctic %s:%u: Directriu no suportada '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
@@ -2219,6 +2234,7 @@ msgid "Unable to stat the mount point %s"
msgstr "No es pot obtenir informació del punt de muntatge %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "No es pot canviar a %s"
@@ -2466,7 +2482,7 @@ msgstr ""
"dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
"LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "El tipus de fitxer índex '%s', no està suportat"
@@ -2586,7 +2602,7 @@ msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2616,7 +2632,7 @@ msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2669,21 +2685,21 @@ msgstr "S'estan recollint els fitxers que proveeixen"
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2693,7 +2709,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2702,7 +2718,7 @@ msgstr ""
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2710,7 +2726,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "La mida no concorda"
@@ -2823,52 +2839,52 @@ msgstr ""
"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
"coincidents\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "S'està preparant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "S'està desempaquetant %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "S'està preparant per a configurar el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "S'està configurant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "S'ha instal·lat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "S'està preparant per a l'eliminació del paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "S'ha eliminat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "S'està preparant per a eliminar completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "S'ha eliminat completament el paquet %s"
diff --git a/po/cs.po b/po/cs.po
index 224131091..37e96a889 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-04 18:53+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pro %s %s zkompilován na %s %s\n"
@@ -652,7 +652,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -813,11 +813,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
@@ -847,7 +847,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu určit volné místo v %s"
@@ -876,7 +876,7 @@ msgstr ""
"Pro pokračování opište frázi '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Přerušeno."
@@ -884,7 +884,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -893,7 +893,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -1027,7 +1027,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
@@ -1040,31 +1040,31 @@ msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ale %s se bude instalovat"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit `apt-get -f install':"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1072,7 +1072,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1083,7 +1083,7 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1093,124 +1093,139 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1219,31 +1234,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1548,9 +1563,9 @@ msgstr "Přepsat vyhovující balík bez udání verze pro %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Soubor %s/%s přepisuje ten z balíku %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Nemohu číst %s"
@@ -1849,7 +1864,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1876,39 +1891,39 @@ msgstr "Dotaz"
msgid "Unable to invoke "
msgstr "Nemohu vyvolat "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Připojuji se k %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nemohu vytvořit socket pro %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nemohu navázat spojení na %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nemohu se připojit k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Připojuji se k %s"
@@ -1983,76 +1998,76 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba čtení z procesu %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2070,58 +2085,58 @@ msgstr "Nešlo mmapovat %lu bajtů"
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nerozpoznaná zkratka typu: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Otevírám konfigurační soubor %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Řádek %d je příliš dlouhý (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
@@ -2188,6 +2203,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Nelze vyhodnotit přípojný bod %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Nemohu přejít do %s"
@@ -2434,7 +2450,7 @@ msgstr ""
"smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
"chcete udělat, aktivujte možnost APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ souboru '%s' není podporován"
@@ -2550,7 +2566,7 @@ msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2580,7 +2596,7 @@ msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2630,21 +2646,21 @@ msgstr "Collecting File poskytuje"
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2653,7 +2669,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2662,14 +2678,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2781,52 +2797,52 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Připravuji %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Připravuji nastavení %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Nastavuji %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Nainstalován %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Připravuji odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Odstraňuji %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Připravuji úplné odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
diff --git a/po/cy.po b/po/cy.po
index c882106df..d42c8ea45 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -174,7 +174,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -680,7 +680,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -850,11 +850,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -883,7 +883,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -912,7 +912,7 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Erthylu."
@@ -921,7 +921,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -930,7 +930,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -1067,7 +1067,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
@@ -1081,32 +1081,32 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1115,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1128,7 +1128,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1137,118 +1137,133 @@ msgstr ""
"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1257,7 +1272,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1266,34 +1281,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1610,9 +1625,9 @@ msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -1928,7 +1943,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1956,39 +1971,39 @@ msgstr "Ymholiad"
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Methwyd cysylltu i %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
@@ -2061,82 +2076,82 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:586
+#: methods/http.cc:585
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:601
+#: methods/http.cc:600
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:603
+#: methods/http.cc:602
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:875
+#: methods/http.cc:874
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2154,59 +2169,59 @@ msgstr "Methwyd gwneud mmap() efo %lu beit"
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linell %d yn rhy hir (uchaf %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
# FIXME
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -2275,6 +2290,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
@@ -2530,7 +2546,7 @@ msgstr ""
"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
@@ -2655,7 +2671,7 @@ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2685,7 +2701,7 @@ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2735,22 +2751,22 @@ msgstr "Yn Casglu Darpariaethau Ffeil"
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2759,7 +2775,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2768,14 +2784,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2885,52 +2901,52 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
diff --git a/po/da.po b/po/da.po
index 32d1d5292..f348b3f51 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-02-03 15:50+0100\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -164,7 +164,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s oversat p %s %s\n"
@@ -660,7 +660,7 @@ msgstr "Kunne ikke omdbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
@@ -821,11 +821,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
@@ -854,7 +854,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -883,7 +883,7 @@ msgstr ""
"For at fortstte, skal du skrive '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Afbryder."
@@ -891,7 +891,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -900,7 +900,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -1036,7 +1036,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
@@ -1049,31 +1049,31 @@ msgstr "Intern fejl. Problemlseren delagde noget"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "men %s forventes installeret"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1081,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgngelige."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1101,115 +1101,130 @@ msgstr ""
"Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n"
"ikke installeres og du br indsende en fejlrapport for denne pakke."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst n pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1232,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1241,32 @@ msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1562,9 +1577,9 @@ msgstr "Overskriv pakkematch uden version for %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overskriver filen i pakken %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke lse %s"
@@ -1864,7 +1879,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1891,39 +1906,39 @@ msgstr "Foresprgsel"
msgid "Unable to invoke "
msgstr "Kunne ikke udfre "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Forbinder til %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudlb"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunne ikke forbinde til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Forbinder til %s"
@@ -1999,77 +2014,77 @@ msgstr "Kunne ikke bne datarr for %s"
msgid "Read error from %s process"
msgstr "Lsefejl fra %s-process"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fandt en enkelt linje i hovedet p over %u tegn"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Intern fejl"
@@ -2087,57 +2102,57 @@ msgstr "Kunne ikke udfre mmap for %lu byte"
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukendt type-forkortelse: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "bner konfigurationsfilen %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linjen %d er for lang (m hjst vre %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfejl %s:%u: Forkert udformet mrke"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfejl %s:%u: Overskydende affald efter vrdien"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfejl %s:%u: For mange sammenkdede inkluderinger"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
@@ -2204,6 +2219,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Kunne ikke finde monteringspunktet %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Kunne ikke skifte til %s"
@@ -2451,7 +2467,7 @@ msgstr ""
"id, men hvis du virkelig vil gre det, kan du aktivere valget 'APT::Force-"
"LoopBreak'."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiler af typen '%s' understttes ikke"
@@ -2568,7 +2584,7 @@ msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2598,7 +2614,7 @@ msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2648,22 +2664,22 @@ msgstr "Samler filudbud"
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2672,7 +2688,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2681,13 +2697,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
@@ -2798,52 +2814,52 @@ msgstr "Skrev %i poster med %i ikke-trufne filer\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Klargr %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Pakker %s ud"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Gr klar til at stte %s op"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Stter %s op"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Installerede %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Gr klar til afinstallation af %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Fjernede %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Gr klar til at fjerne %s helt"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
diff --git a/po/de.po b/po/de.po
index d45f634aa..549eb7685 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-24 11:45+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s für %s %s kompiliert am %s %s\n"
@@ -669,7 +669,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
@@ -830,11 +830,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -865,7 +865,7 @@ msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
@@ -894,7 +894,7 @@ msgstr ""
"Zum Fortfahren geben Sie bitte „%s“ ein.\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abbruch."
@@ -902,7 +902,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
@@ -911,7 +911,7 @@ msgstr "Konnte %s nicht holen %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
@@ -1048,7 +1048,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
@@ -1062,31 +1062,31 @@ msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "aber %s soll installiert werden"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1094,7 @@ msgstr ""
"Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne "
"jeglich Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1106,7 +1106,7 @@ msgstr ""
"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1117,119 +1117,134 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Überspringe schon heruntergeladene Datei „%s“\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl „%s“ fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden."
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1238,7 +1253,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1247,32 +1262,32 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare "
"Version von Paket %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
"zu neu."
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1588,9 +1603,9 @@ msgstr "Überschreibe Paket-Treffer ohne Version für %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datei %s/%s überschreibt die Datei in Paket %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Kann %s nicht lesen"
@@ -1894,7 +1909,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1921,40 +1936,40 @@ msgstr "Abfrage"
msgid "Unable to invoke "
msgstr "Kann nicht aufrufen: "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Verbinde mit %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kann keinen Verbindungsendpunkt für %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Konnte nicht mit %s:%s verbinden (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Verbinde mit %s"
@@ -2033,78 +2048,78 @@ msgstr "Konnte keine Pipe für %s öffnen"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
"geschlossen"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2122,58 +2137,58 @@ msgstr "Konnte kein mmap von %lu Bytes durchführen"
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nicht erkannte Typabkürzung: „%c“"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Öffne Konfigurationsdatei %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Zeile %d zu lang (maximal %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfehler %s:%u: Block fängt ohne Namen an."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfehler %s:%u: Einbindung von here"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende"
@@ -2241,6 +2256,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Kann auf den Einhängepunkt %s nicht zugreifen."
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Kann nicht nach %s wechseln"
@@ -2488,7 +2504,7 @@ msgstr ""
"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
"die Option APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indexdateityp „%s“ wird nicht unterstützt"
@@ -2611,7 +2627,7 @@ msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2641,7 +2657,7 @@ msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2697,22 +2713,22 @@ msgstr "Sammle Datei-Empfehlungen ein"
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Sichern des Quellcaches"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2721,7 +2737,7 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2730,14 +2746,14 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
@@ -2850,52 +2866,52 @@ msgstr ""
"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
"geschrieben.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "%s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "%s wird entpackt"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Konfiguration von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Konfiguriere %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s installiert"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Entfernen von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "%s wird entfernt"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s entfernt"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Komplettes Entfernen von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s komplett entfernt"
diff --git a/po/el.po b/po/el.po
index f2459879f..3d45aa390 100644
--- a/po/el.po
+++ b/po/el.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-01-18 15:16+0200\n"
"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -173,7 +173,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
@@ -673,7 +673,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -837,11 +837,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -872,7 +872,7 @@ msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθού
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
@@ -901,7 +901,7 @@ msgstr ""
"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Εγκατάλειψη."
@@ -909,7 +909,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -918,7 +918,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -1057,7 +1057,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
@@ -1072,31 +1072,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1104,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1116,7 +1116,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1126,120 +1126,135 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1262,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1271,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1592,9 +1607,9 @@ msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδο
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
@@ -1893,7 +1908,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1920,39 +1935,39 @@ msgstr "Επερώτηση"
msgid "Unable to invoke "
msgstr "Αδύνατη η εκτέλεση"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Σύνδεση στο %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Σύνδεση στο %s"
@@ -2028,77 +2043,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2116,58 +2131,58 @@ msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
@@ -2235,6 +2250,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Αδύνατη η αλλαγή σε %s"
@@ -2485,7 +2501,7 @@ msgstr ""
"είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
"επιλογή APT::Force-LoopBreak option."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
@@ -2607,7 +2623,7 @@ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία τ
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2637,7 +2653,7 @@ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία τ
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2688,21 +2704,21 @@ msgstr "Συλλογή Παροχών Αρχείου"
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2711,7 +2727,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2720,7 +2736,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2728,7 +2744,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2839,52 +2855,52 @@ msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Προετοιμασία του %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Ξεπακετάρισμα του %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Προετοιμασία ρύθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Ρύθμιση του %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Εγκατέστησα το %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Προετοιμασία για την αφαίρεση του %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Αφαιρώ το %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Αφαίρεσα το %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Προετοιμασία ρύθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Αποτυχία διαγραφής του %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index eba9735c5..3cdaaa82c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s compiled on %s %s\n"
@@ -653,7 +653,7 @@ msgstr "Failed to rename %s to %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
@@ -814,11 +814,11 @@ msgstr "Packages need to be removed but remove is disabled."
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -847,7 +847,7 @@ msgstr "After unpacking %sB of additional disk space will be used.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "After unpacking %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -876,7 +876,7 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abort."
@@ -884,7 +884,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -893,7 +893,7 @@ msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -1027,7 +1027,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
@@ -1040,31 +1040,31 @@ msgstr "Internal error, problem resolver broke stuff"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "but %s is to be installed"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run ‘apt-get -f install’ to correct these:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1072,7 +1072,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1084,7 +1084,7 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1094,115 +1094,130 @@ msgstr ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "Must specify at least one package to check builddeps for"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1211,7 +1226,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1220,31 +1235,31 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1551,9 +1566,9 @@ msgstr "Overwrite package match with no version for %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overwrites the one in the package %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Unable to read %s"
@@ -1852,7 +1867,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1879,39 +1894,39 @@ msgstr "Query"
msgid "Unable to invoke "
msgstr "Unable to invoke"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connecting to %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Cannot initiate the connection to %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Could not connect to %s:%s (%s), connection timed out"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Could not connect to %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connecting to %s"
@@ -1986,76 +2001,76 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Internal error"
@@ -2073,57 +2088,57 @@ msgstr "Couldn't make mmap of %lu bytes"
msgid "Selection %s not found"
msgstr "Selection %s not found"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Unrecognized type abbreviation: ‘%c’"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Opening configuration file %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Line %d too long (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntax error %s:%u: Block starts with no name."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntax error %s:%u: Malformed tag"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntax error %s:%u: Extra junk after value"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntax error %s:%u: Directives can only be done at the top level"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntax error %s:%u: Too many nested includes"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntax error %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: Extra junk at end of file"
@@ -2190,6 +2205,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Unable to stat the mount point %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Unable to change to %s"
@@ -2436,7 +2452,7 @@ msgstr ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Index file type ‘%s’ is not supported"
@@ -2553,7 +2569,7 @@ msgstr "Error occurred while processing %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Error occurred while processing %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2583,7 +2599,7 @@ msgstr "Error occurred while processing %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Error occurred while processing %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2631,21 +2647,21 @@ msgstr "Collecting File Provides"
msgid "IO Error saving source cache"
msgstr "IO Error saving source cache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2654,7 +2670,7 @@ msgstr ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2663,14 +2679,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2781,52 +2797,52 @@ msgstr "Wrote %i records with %i mismatched files\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Configuring %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Installed %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparing for removal of %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Removing %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparing to completely remove %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Completely removed %s"
diff --git a/po/es.po b/po/es.po
index ffa43d739..eddc7e285 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-08 00:23+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -163,7 +163,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
@@ -668,7 +668,7 @@ msgstr "Fall el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
@@ -829,11 +829,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no termin el ordenamiento"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -865,7 +865,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -894,7 +894,7 @@ msgstr ""
"Para continuar escriba la frase %s\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abortado."
@@ -902,7 +902,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -911,7 +911,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
@@ -1045,7 +1045,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
@@ -1060,31 +1060,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "pero %s va a ser instalado"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1092,7 +1092,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1104,7 +1104,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1114,119 +1114,134 @@ msgstr ""
"paquete simplemente no sea instalable y debera de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solucin de problemas rompi\n"
"algunas cosas"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando fichero ya descargado '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete dpkg-dev est instalado.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construccin"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener informacin de dependencias de construccin para %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1235,7 +1250,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1244,32 +1259,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versin\n"
"disponible del paquete %s satisface los requisitos de versin"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construccin de %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1584,9 +1599,9 @@ msgstr "Sobreescribiendo concordancia del paquete sin versin para %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "El archivo %s/%s sobreescribe al que est en el paquete %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "No pude leer %s"
@@ -1886,7 +1901,7 @@ msgstr "Expir conexin a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexin"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1913,39 +1928,39 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "No pude invocar "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando a %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "No puedo iniciar la conexin a %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No pude conectarme a %s:%s (%s), expir tiempo para conexin"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No pude conectarme a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
@@ -2022,76 +2037,76 @@ msgstr "No pude abrir una tubera para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Mala lnea de cabecera"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envi una cabecera de respuesta invlida"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envi una cabecera de Content-Length invlida"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envi una cabecera de Content-Range invlida"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "ste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Error interno"
@@ -2109,59 +2124,59 @@ msgstr "No pude hacer mmap de %lu bytes"
msgid "Selection %s not found"
msgstr "Seleccin %s no encontrada"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tipo de abreviacin no reconocida: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Abriendo fichero de configuracin %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Lnea %d demasiado larga (mx %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Error de sintaxis %s:%u: Marca mal formada"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Error de sintaxis %s:%u: Basura extra despus del valor"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Error de sintaxis %s:%u: Las directivas slo se pueden poner\n"
"en el primer nivel"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Error de sintaxis %s:%u: Incluido desde aqu"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
@@ -2230,6 +2245,7 @@ msgid "Unable to stat the mount point %s"
msgstr "No se puede obtener informacin del punto de montaje %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "No se pudo cambiar a %s"
@@ -2477,7 +2493,7 @@ msgstr ""
"Esto generalmente es malo, pero si realmente quiere hacerlo, active \n"
"la opcin APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "No se da soporte para el tipo de archivo de ndice '%s'"
@@ -2599,7 +2615,7 @@ msgstr "Ocurri un error mientras se procesaba %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2629,7 +2645,7 @@ msgstr "Ocurri un error mientras se procesaba %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2682,23 +2698,23 @@ msgstr "Recogiendo archivos que proveen"
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando cach fuente"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pblica disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2708,7 +2724,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2717,7 +2733,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2725,7 +2741,7 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "El tamao difiere"
@@ -2837,52 +2853,52 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparndose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparndose para eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s eliminado"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparndose para eliminar completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Se borr completamente %s"
diff --git a/po/eu.po b/po/eu.po
index f27f1005a..4bbb76b5d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-27 13:59+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -163,7 +163,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s) konpilatua: %s %s\n"
@@ -657,7 +657,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio-errorea - %s"
@@ -818,11 +818,11 @@ msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
@@ -853,7 +853,7 @@ msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -882,7 +882,7 @@ msgstr ""
"Jarratzeko, idatzi '%s' esaldia\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abortatu."
@@ -890,7 +890,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -899,7 +899,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -1033,7 +1033,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
@@ -1046,31 +1046,31 @@ msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "baina %s instalatzeko dago"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1078,7 +1078,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1090,7 +1090,7 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1099,117 +1099,132 @@ msgstr ""
"Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n"
"izango, eta pakete horren errorearen berri ematea komeni da."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1232,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1241,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1559,9 +1574,9 @@ msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
@@ -1865,7 +1880,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1892,40 +1907,40 @@ msgstr "Kontsulta"
msgid "Unable to invoke "
msgstr "Ezin da deitu "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ezin izan da konektatu -> %s:%s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Konektatzen -> %s..."
@@ -2000,76 +2015,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Barne-errorea"
@@ -2087,57 +2102,57 @@ msgstr "Ezin izan da %lu byteren mmap egin"
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Mota ezezaguneko laburtzapena: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "%s konfigurazio-fitxategia irekitzen"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "%d lerroa luzeegia da (gehienez %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Sintasi errorea %s:%u: Gaizki eratutako"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran"
@@ -2205,6 +2220,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Ezin da atzitu %s muntatze-puntua"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Ezin da %s(e)ra aldatu"
@@ -2455,7 +2471,7 @@ msgstr ""
"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
"aukera."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "'%s' motako indize-fitxategirik ez da onartzen"
@@ -2571,7 +2587,7 @@ msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2601,7 +2617,7 @@ msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2649,21 +2665,21 @@ msgstr "Fitxategi-erreferentziak biltzen"
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu-cachea gordetzean"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2672,7 +2688,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2681,7 +2697,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2689,7 +2705,7 @@ msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2800,52 +2816,52 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "%s prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "%s irekitzen"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfiguratzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "%s konfiguratzen"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s Instalatuta"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s kentzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "%s kentzen"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s kendurik"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s guztiz ezabatzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
diff --git a/po/fi.po b/po/fi.po
index 363c21508..636f632ed 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-29 16:06+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
@@ -657,7 +657,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -818,11 +818,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -852,7 +852,7 @@ msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -882,7 +882,7 @@ msgstr ""
"Jatka kirjoittamalla \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Keskeytä."
@@ -890,7 +890,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -899,7 +899,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -1033,7 +1033,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
@@ -1046,31 +1046,31 @@ msgstr "Sisäinen virhe, resolver rikkoi jotain"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "mutta %s on merkitty asennettavaksi"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1078,7 +1078,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1089,7 +1089,7 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1099,116 +1099,131 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1216,7 +1231,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1225,32 +1240,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1558,9 +1573,9 @@ msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versi
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
@@ -1859,7 +1874,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1886,39 +1901,39 @@ msgstr "Kysely"
msgid "Unable to invoke "
msgstr "Käynnistys ei onnistu"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Avataan yhteys %s"
@@ -1995,76 +2010,76 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2082,57 +2097,57 @@ msgstr "Ei voitu tehdä %lu tavun mmap:ia"
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tuntematon tyypin lyhenne: \"%c\""
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Avataan asetustiedosto %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Rivi %d on liian pitkä (enintään %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
@@ -2199,6 +2214,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Komento stat ei toiminut liitoskohdalle %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Kansioon %s vaihto ei onnistu"
@@ -2445,7 +2461,7 @@ msgstr ""
"s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta "
"jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
@@ -2561,7 +2577,7 @@ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2591,7 +2607,7 @@ msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2640,21 +2656,21 @@ msgstr "Kootaan tiedostojen tarjoamistietoja"
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2663,7 +2679,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2672,7 +2688,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2680,7 +2696,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Koko ei täsmää"
@@ -2795,52 +2811,52 @@ msgstr ""
"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
"tiedostoa\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Valmistellaan %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Puretaan %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Valmistaudutaan tekemään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Tehdään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s asennettu"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Valmistaudutaan poistamaan %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Poistetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s poistettu"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Valmistaudutaan poistamaan %s kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
diff --git a/po/fr.po b/po/fr.po
index fa8e7e192..3dc764a50 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
-"PO-Revision-Date: 2007-06-12 22:24+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
+"PO-Revision-Date: 2007-05-08 11:30+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -59,8 +59,9 @@ msgid "Total distinct versions: "
msgstr "Nombre de versions distinctes: "
#: cmdline/apt-cache.cc:295
+#, fuzzy
msgid "Total Distinct Descriptions: "
-msgstr "Nombre de descriptions distinctes: "
+msgstr "Nombre de versions distinctes: "
#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
@@ -71,8 +72,9 @@ msgid "Total ver/file relations: "
msgstr "Nombre de relations version/fichier: "
#: cmdline/apt-cache.cc:302
+#, fuzzy
msgid "Total Desc/File relations: "
-msgstr "Nombre de relations description/fichier: "
+msgstr "Nombre de relations version/fichier: "
#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
@@ -159,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pour %s %s est compil le %s %s\n"
@@ -243,11 +245,13 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1"
+msgstr ""
+"Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre"
+msgstr ""
+"Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
@@ -323,7 +327,8 @@ msgstr "Impossible d'crire sur %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est install?"
+msgstr ""
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est install?"
#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
@@ -439,7 +444,8 @@ msgstr "Aucune slection ne correspond"
#: ftparchive/apt-ftparchive.cc:832
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s"
+msgstr ""
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s"
#: ftparchive/cachedb.cc:43
#, c-format
@@ -662,7 +668,7 @@ msgstr "Impossible de changer le nom %s en %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -818,17 +824,18 @@ msgstr "Erreur interne, InstallPackages appel avec des paquets casss."
#: cmdline/apt-get.cc:779
msgid "Packages need to be removed but remove is disabled."
-msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
+msgstr ""
+"Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
#: cmdline/apt-get.cc:790
msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a t interrompu."
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le rpertoire de tlchargement"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut tre lue."
@@ -852,14 +859,15 @@ msgstr "Il est ncessaire de prendre %so dans les archives.\n"
#: cmdline/apt-get.cc:844
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
+msgstr ""
+"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
#: cmdline/apt-get.cc:847
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de dterminer l'espace disponible sur %s"
@@ -892,7 +900,7 @@ msgstr ""
"Pour continuer, tapez la phrase %s\n"
"?]"
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Annulation."
@@ -900,7 +908,7 @@ msgstr "Annulation."
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de rcuprer %s %s\n"
@@ -909,7 +917,7 @@ msgstr "Impossible de rcuprer %s %s\n"
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu tre tlchargs."
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Tlchargement achev et dans le mode tlchargement uniquement"
@@ -923,7 +931,8 @@ msgstr ""
#: cmdline/apt-get.cc:1005
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "l'option --fix-missing et l'change de support ne sont pas encore reconnus."
+msgstr ""
+"l'option --fix-missing et l'change de support ne sont pas encore reconnus."
#: cmdline/apt-get.cc:1010
msgid "Unable to correct missing packages."
@@ -985,7 +994,8 @@ msgstr "Aucun paquet ne correspond au paquet %s"
#: cmdline/apt-get.cc:1148
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
+msgstr ""
+"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
#: cmdline/apt-get.cc:1156
#, c-format
@@ -1025,64 +1035,66 @@ msgstr ""
#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Aucune suppression n'est sense se produire:impossible de lancer Autoremover"
+msgstr ""
#: cmdline/apt-get.cc:1465
+#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr "Les paquets suivants ont t installs automatiquement et ne sont plus ncessaires:"
+msgstr "Les NOUVEAUX paquets suivants seront installs:"
#: cmdline/apt-get.cc:1467
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Veuillez utiliser apt-get autoremove pour les supprimer."
+msgstr ""
#: cmdline/apt-get.cc:1472
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-"Il semble que l'outil de suppression automatique (Autoremover) ait\n"
-"supprim quelque chose, ce qui est inattendu. Veuillez envoyer un\n"
-"rapport de bogue pour le paquet apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "L'information suivante devrait vous aider rsoudre la situation: "
#: cmdline/apt-get.cc:1479
+#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erreur interne, l'outil de suppression automatique a cass quelque chose."
+msgstr ""
+"Erreur interne, la tentative de rsolution du problme a cass certaines "
+"parties"
#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cass le boulot!"
-#: cmdline/apt-get.cc:1543
-#, c-format
+#: cmdline/apt-get.cc:1544
+#, fuzzy, c-format
msgid "Couldn't find task %s"
-msgstr "Impossible de trouver la tche %s"
+msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
-#: cmdline/apt-get.cc:1711
-#, c-format
+#: cmdline/apt-get.cc:1712
+#, fuzzy, c-format
msgid "%s set to manual installed.\n"
-msgstr "%s pass en install manuellement.\n"
+msgstr "mais %s devra tre install"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
+msgstr ""
+"Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1090,7 +1102,7 @@ msgstr ""
"Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1102,7 +1114,7 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"t crs ou ne sont pas sortis d'Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1111,119 +1123,134 @@ msgstr ""
"Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n"
"probablement pas installable et vous devriez envoyer un rapport de bogue."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Paquets dfectueux"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplmentaires suivants seront installs: "
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Paquets suggrs:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Paquets recommands:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calcul de la mise jour... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "chec"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de rsolution du problme a cass certaines "
"parties"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spcifier au moins un paquet source"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ncessit de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ncessit de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Rcupration des sources %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "chec lors de la rcupration de quelques archives."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de dcompactage %s a chou.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction %s a chou.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "chec du processus fils"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spcifier au moins un paquet pour vrifier les dpendances de "
"construction"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dpendances de construction pour %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dpendance de construction.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1232,7 +1259,7 @@ msgstr ""
"La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne "
"peut tre trouv"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1241,32 +1268,34 @@ msgstr ""
"La dpendance %s vis--vis de %s ne peut tre satisfaite car aucune version "
"du paquet %s ne peut satisfaire la version requise"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dpendance %s pour %s: le paquet install %s "
"est trop rcent"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dpendances %s pour %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
+msgstr ""
+"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dpendances de construction"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Modules reconnus:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1345,7 +1374,7 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Place une option de configuration arbitraire, ex. -o dir::cache=/tmp\n"
"Reportez-vous aux pages de manuels d'apt-get(8), sources.list(5) et\n"
-"apt.conf(5) pour plus d'informations et d'option.\n"
+"apt.conf(5) pour plus d'information et d'option.\n"
" Cet APT a les Super Cow Powers\n"
#: cmdline/acqprogress.cc:55
@@ -1440,7 +1469,8 @@ msgstr ""
"seules les erreurs"
#: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"prcdant ce message sont importantes. Veuillez les corriger et\n"
"dmarrer l'[I]nstallation une nouvelle fois."
@@ -1578,9 +1608,9 @@ msgstr "crase la correspondance de paquet sans version pour %s "
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Le fichier %s/%s crase celui inclus dans le paquet %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
@@ -1698,7 +1728,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie %s manquante"
#: apt-inst/deb/debfile.cc:48
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s"
+msgstr ""
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s"
#: apt-inst/deb/debfile.cc:108
#, c-format
@@ -1802,7 +1833,8 @@ msgstr ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s"
+msgstr ""
+"La commande %s du script de connexion a chou, le serveur a rpondu: %s"
#: methods/ftp.cc:291
#, c-format
@@ -1839,7 +1871,8 @@ msgstr "Impossible de crer un connecteur"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass"
+msgstr ""
+"Impossible de se connecter sur le port de donnes, dlai de connexion dpass"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1883,7 +1916,7 @@ msgstr "Dlai de connexion au port de donnes dpass"
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problme de hachage du fichier"
@@ -1910,39 +1943,39 @@ msgstr "Requte"
msgid "Unable to invoke "
msgstr "Impossible d'invoquer "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connexion %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Impossible de crer de connexion pour %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Impossible d'initialiser la connexion %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Connexion %s:%s (%s) impossible, dlai de connexion dpass"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Connexion %s:%s (%s) impossible."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connexion %s"
@@ -1976,10 +2009,12 @@ msgstr "Impossible d'accder au porte-cls:%s"
#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr ""
+"E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon."
#: methods/gpgv.cc:204
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne: signature correcte, mais il est impossible de dterminer "
"l'empreinte de la cl."
@@ -2021,76 +2056,76 @@ msgstr "Ne parvient pas ouvrir le tube pour %s"
msgid "Read error from %s process"
msgstr "Erreur de lecture du processus %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tte"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tte au-dessus du caractre %u"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tte"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoy un en-tte Content-Length invalide"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoy un en-tte Content-Range invalide"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possde un support des limites non-valide"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Slection dfaillante"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Dlai de connexion dpass"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erreur d'criture du fichier de sortie"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erreur d'criture sur un fichier"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erreur d'criture sur le fichier"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Mauvais en-tte de donne"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "chec de la connexion"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Erreur interne"
@@ -2108,59 +2143,59 @@ msgstr "Impossible de raliser un mapping de %lu octets en mmoire"
msgid "Selection %s not found"
msgstr "La slection %s n'a pu tre trouve"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Type d'abrviation non reconnue: %c"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Ouverture du fichier de configuration %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "La ligne %d est trop longue (maxi %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erreur syntaxique %s:%u: le bloc commence sans aucun nom."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erreur syntaxique %s:%u: balise mal forme"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erreur syntaxique %s:%u: valeur suivie de choses illicites"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Erreur syntaxique %s:%u: ces directives ne peuvent tre appliques qu'au "
"niveau le plus haut"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erreur syntaxique %s:%u:trop de niveaux d'imbrication d'includes"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erreur syntaxique %s:%u: inclus partir d'ici"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erreur syntaxique %s:%u: directive %s non tolre"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erreur syntaxique %s:%u: valeur aberrante la fin du fichier"
@@ -2227,6 +2262,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Impossible de localiser le point de montage %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Impossible d'accder %s"
@@ -2353,7 +2389,7 @@ msgstr "Rend obsolte"
#: apt-pkg/pkgcache.cc:226
msgid "Breaks"
-msgstr "Casse"
+msgstr ""
#: apt-pkg/pkgcache.cc:237
msgid "important"
@@ -2388,18 +2424,19 @@ msgid "Dependency generation"
msgstr "Gnration des dpendances"
#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#, fuzzy
msgid "Reading state information"
-msgstr "Lecture des informations d'tat"
+msgstr "Fusion des informations disponibles"
#: apt-pkg/depcache.cc:198
-#, c-format
+#, fuzzy, c-format
msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'tat %s"
+msgstr "Impossible d'ouvrir %s"
#: apt-pkg/depcache.cc:204
-#, c-format
+#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'criture du fichier d'tat temporaire %s"
+msgstr "Erreur d'criture du fichier %s"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2429,12 +2466,14 @@ msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de l'URI)"
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)"
+msgstr ""
+"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)"
#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)"
+msgstr ""
+"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)"
#: apt-pkg/sourcelist.cc:199
#, c-format
@@ -2454,12 +2493,14 @@ msgstr "Ligne %u mal forme dans la liste des sources %s (type)"
#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Le type %s est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr ""
+"Le type %s est inconnu sur la ligne %u dans la liste des sources %s"
#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)"
+msgstr ""
+"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:399
#, c-format
@@ -2473,14 +2514,15 @@ msgstr ""
"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez rellement "
"le faire, activez l'option APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Le type de fichier d'index %s n'est pas accept"
#: apt-pkg/algorithms.cc:247
#, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son "
"archive."
@@ -2554,7 +2596,8 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Vous devez insrer quelques adresses sources dans votre sources.list"
+msgstr ""
+"Vous devez insrer quelques adresses sources dans votre sources.list"
#: apt-pkg/cachefile.cc:69
msgid "The package lists or status file could not be parsed or opened."
@@ -2596,9 +2639,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Erreur apparue lors du traitement de %s (NewFileDesc1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
#, c-format
@@ -2626,28 +2669,31 @@ msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Erreur apparue lors du traitement de %s (NewFileVer2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"Vous avez dpass le nombre de noms de paquets que cette version d'APT est capable de "
+"Vous avez dpass le nombre de noms de paquets que cet APT est capable de "
"traiter."
#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vous avez dpass le nombre de versions que cette version d'APT est capable de traiter."
+msgstr ""
+"Vous avez dpass le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:257
+#, fuzzy
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vous avez dpass le nombre de descriptions que cette version d'APT est capable de traiter."
+msgstr ""
+"Vous avez dpass le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-"Vous avez dpass le nombre de dpendances que cette version d'APT est capable de "
+"Vous avez dpass le nombre de dpendances que cet APT est capable de "
"traiter."
#: apt-pkg/pkgcachegen.cc:288
@@ -2678,23 +2724,25 @@ msgstr "Assemblage des fichiers lists dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
msgid "IO Error saving source cache"
-msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr ""
+"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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"
+msgstr ""
+"Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2704,7 +2752,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2713,14 +2761,15 @@ msgstr ""
"Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Taille incohrente"
@@ -2770,11 +2819,11 @@ msgid "Scanning disc for index files..\n"
msgstr "Examen du disque la recherche de fichiers d'index...\n"
#: apt-pkg/cdrom.cc:671
-#, c-format
+#, fuzzy, c-format
msgid ""
"Found %i package indexes, %i source indexes, %i translation indexes and %i "
"signatures\n"
-msgstr "%i index de paquets trouvs, %i index de sources, %i index de traductions et %i signatures\n"
+msgstr "%i index de paquets trouvs, %i index de sources et %i signatures\n"
#: apt-pkg/cdrom.cc:708
#, c-format
@@ -2832,61 +2881,61 @@ msgstr ""
"%i enregistrements crits avec %i fichiers manquants et %i qui ne "
"correspondent pas\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Prparation de %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Dcompression de %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Prparation de la configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s install"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Prparation de la suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s supprim"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Prparation de la suppression complte de %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s compltement supprim"
#: methods/rred.cc:219
+#, fuzzy
msgid "Could not patch file"
-msgstr "Impossible de corriger le fichier"
+msgstr "Impossible de verrouiller %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connexion ferme prmaturment"
-
diff --git a/po/gl.po b/po/gl.po
index 24f896f26..a7ff71dea 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,13 +1,13 @@
# Galician translation of apt
# This file is put in the public domain.
-# Jacobo Tarrío <jtarrio@debian.org>, 2005, 2007.
+# Jacobo Tarrío <jtarrio@debian.org>, 2005.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
-"PO-Revision-Date: 2007-06-18 15:26+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
+"PO-Revision-Date: 2007-02-28 13:14+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
"MIME-Version: 1.0\n"
@@ -55,8 +55,9 @@ msgid "Total distinct versions: "
msgstr "Número total de versións distintas: "
#: cmdline/apt-cache.cc:295
+#, fuzzy
msgid "Total Distinct Descriptions: "
-msgstr "Número total de descricións distintas: "
+msgstr "Número total de versións distintas: "
#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
@@ -67,8 +68,9 @@ msgid "Total ver/file relations: "
msgstr "Número total de relacións versión/ficheiro: "
#: cmdline/apt-cache.cc:302
+#, fuzzy
msgid "Total Desc/File relations: "
-msgstr "Número total de relacións descrición/ficheiro: "
+msgstr "Número total de relacións versión/ficheiro: "
#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
@@ -157,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
@@ -233,7 +235,7 @@ msgstr ""
" -q Desactiva o indicador de progreso.\n"
" -i Amosa só as dependencias importantes na orde unmet.\n"
" -c=? Le este ficheiro de configuración.\n"
-" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
"Vexa as páxinas de manual de apt-cache(8) e apt.conf(5) para máis "
"información.\n"
@@ -280,7 +282,7 @@ msgstr ""
"Opcións:\n"
" -h Este texto de axuda.\n"
" -c=? Le este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
#: cmdline/apt-extracttemplates.cc:98
@@ -308,9 +310,9 @@ msgstr ""
"\n"
"Opcións:\n"
" -h Este texto de axuda\n"
-" -t Establece o directorio temporal\n"
+" -t Estabrece o directorio temporal\n"
" -c=? Le este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
@@ -429,7 +431,7 @@ msgstr ""
" --no-delink Activa o modo de depuración de desligado\n"
" --contents Controla a xeración do ficheiro de contido\n"
" -c=? Le este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración"
+" -o=? Estabrece unha opción de configuración"
#: ftparchive/apt-ftparchive.cc:759
msgid "No selections matched"
@@ -662,7 +664,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro na compilación da expresión regular - %s"
@@ -823,11 +825,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
@@ -857,7 +859,7 @@ msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non se puido determinar o espazo libre en %s"
@@ -886,7 +888,7 @@ msgstr ""
"Para continuar escriba a frase \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abortar."
@@ -894,7 +896,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non se puido obter %s %s\n"
@@ -903,7 +905,7 @@ msgstr "Non se puido obter %s %s\n"
msgid "Some files failed to download"
msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -1021,65 +1023,62 @@ msgstr ""
#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-"Non se supón que se deban eliminar cousas; non se pode iniciar o "
-"autoeliminador"
#: cmdline/apt-get.cc:1465
+#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr ""
-"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
#: cmdline/apt-get.cc:1467
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Empregue \"apt-get autoremove\" para eliminalos."
+msgstr ""
#: cmdline/apt-get.cc:1472
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-"Hum, semella que o autoeliminadir destruiu algo, o que non debería\n"
-"ter ocorrido. Envíe un informe de erro sobre apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte información pode axudar a resolver a situación:"
#: cmdline/apt-get.cc:1479
+#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erro interno, o autoeliminador rompeu cousas"
+msgstr "Erro interno, o resolvedor interno rompeu cousas"
#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1543
-#, c-format
+#: cmdline/apt-get.cc:1544
+#, fuzzy, c-format
msgid "Couldn't find task %s"
-msgstr "Non se puido atopar a tarefa %s"
+msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1711
-#, c-format
+#: cmdline/apt-get.cc:1712
+#, fuzzy, c-format
msgid "%s set to manual installed.\n"
-msgstr "%s cambiado a instalado manualmente.\n"
+msgstr "pero hase instalar %s"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1087,7 +1086,7 @@ msgstr ""
"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
"especifique unha solución)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1098,7 +1097,7 @@ msgstr ""
"unha situación imposible ou, se emprega a distribución inestable, que\n"
"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1107,118 +1106,133 @@ msgstr ""
"Xa que só solicitou unha soa operación, é bastante probable que o\n"
"paquete non sea instalable e que se deba informar dun erro no paquete."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Rematado"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1227,7 +1241,7 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
"o paquete %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1250,33 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
"novo de máis"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1317,34 +1332,32 @@ msgstr ""
" install - Instala novos paquetes (o paquete chámase libc6, non libc6."
"deb)\n"
" remove - Elimina paquetes\n"
-" purge - Elimina e purga paquetes\n"
" source - Descarga arquivos de código fonte\n"
" build-dep - Configura as dependencias de compilación dos paquetes fonte\n"
-" dist-upgrade - Actualiza a distribución, consulte apt-get(8)\n"
-" dselect-upgrade - Segue as seleccións de dselect\n"
+" dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n"
+" dselect-upgrade - Sigue as seleccións de dselect\n"
" clean - Borra os arquivos descargados\n"
" autoclean - Borra os arquivos antigos descargados\n"
-" check - Comproba que non haxa dependencias rotas\n"
+" check - Verifica que non hai dependencias rotas\n"
"\n"
"Opcións:\n"
" -h Este texto de axuda.\n"
" -q Saída que se pode rexistrar - sen indicador de progreso\n"
-" -qq Sen saída agás polos erros\n"
+" -qq Sen saída agás os erros\n"
" -d Só descarga - NON instala nin desempaqueta os arquivos\n"
" -s No-act. Realiza unha simulación de ordeamento\n"
-" -y Supón unha resposta afirmativa a tódalas preguntas sen amosalas\n"
+" -y Supón \"Sí\" a tódalas preguntas e non as amosa\n"
" -f Tenta continuar se a comprobación de integridade falla\n"
" -m Tenta continuar se non se poden localizar os arquivos\n"
" -u Tamén amosa unha lista de paquetes actualizados\n"
" -b Constrúe o paquete fonte despois de o descargar\n"
" -V Amosa números detallados de versión\n"
" -c=? Le este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/"
+" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-"Consulte as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) "
-"para\n"
-"máis información e opcións.\n"
-" Este APT ten Poderes de Supervaca.\n"
+"Vexa as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) para\n"
+"ver máis información e opcións.\n"
+" Este APT ten Poderes de Super Vaca.\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1409,7 +1422,7 @@ msgstr ""
" -h Este texto de axuda\n"
" -s Emprega ordeamento por ficheiros fonte\n"
" -c=? Le este ficheiro de configuración\n"
-" -o=? Establece unha opción de configuración; por exemplo, -o dir::cache=/"
+" -o=? Estabrece unha opción de configuración; por exemplo, -o dir::cache=/"
"tmp\n"
#: dselect/install:32
@@ -1572,9 +1585,9 @@ msgstr "Coincidencia na sobrescritura sen versión para %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Non se pode ler %s"
@@ -1874,7 +1887,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
msgid "Unable to accept connection"
msgstr "Non se pode aceptar a conexión"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1901,39 +1914,39 @@ msgstr "Petición"
msgid "Unable to invoke "
msgstr "Non se puido chamar a "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "A conectar a %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Non se pode iniciar a conexión a %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Non se puido conectar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "A conectar a %s"
@@ -2012,76 +2025,76 @@ msgstr "Non se puido abrir unha canle para %s"
msgid "Read error from %s process"
msgstr "Erro de lectura do proceso %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "A agardar polas cabeceiras"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Liña de cabeceira incorrecta"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP ten un soporte de rangos roto"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data descoñecido"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro ao escribir no ficheiro de saída"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro ao escribir nun ficheiro"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro ao escribir no ficheiro"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "A conexión fallou"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Erro interno"
@@ -2099,57 +2112,57 @@ msgstr "Non se puido facer mmap de %lu bytes"
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviatura de tipo \"%c\" descoñecida"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "A abrir o ficheiro de configuración %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Liña %d longa de máis (máximo %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erro de sintaxe %s:%u: Incluído de aquí"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\""
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña"
@@ -2217,6 +2230,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Non se pode analizar o punto de montaxe %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Non se pode cambiar a %s"
@@ -2343,7 +2357,7 @@ msgstr "Fai obsoleto a"
#: apt-pkg/pkgcache.cc:226
msgid "Breaks"
-msgstr "Rompe"
+msgstr ""
#: apt-pkg/pkgcache.cc:237
msgid "important"
@@ -2378,18 +2392,19 @@ msgid "Dependency generation"
msgstr "Xeración de dependencias"
#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#, fuzzy
msgid "Reading state information"
-msgstr "A ler a información do estado"
+msgstr "A mesturar a información sobre paquetes dispoñibles"
#: apt-pkg/depcache.cc:198
-#, c-format
+#, fuzzy, c-format
msgid "Failed to open StateFile %s"
-msgstr "Non se puido abrir o ficheiro de estado %s"
+msgstr "Non se puido abrir %s"
#: apt-pkg/depcache.cc:204
-#, c-format
+#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Non se puido gravar o ficheiro de estado temporal %s"
+msgstr "Non se puido gravar o ficheiro %s"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2462,7 +2477,7 @@ msgstr ""
"%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, "
"pero se o quere facer, active a opción APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "O tipo de ficheiros de índices \"%s\" non está soportado"
@@ -2581,9 +2596,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ocorreu un erro ao procesar %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
#, c-format
@@ -2611,9 +2626,9 @@ msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2624,8 +2639,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Guau, superou o número de versións que este APT pode manexar."
#: apt-pkg/pkgcachegen.cc:257
+#, fuzzy
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Guau, superou o número de descricións que este APT pode manexar."
+msgstr "Guau, superou o número de versións que este APT pode manexar."
#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2659,22 +2675,22 @@ msgstr "A recoller as provisións de ficheiros"
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar a caché de fontes"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2683,7 +2699,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2692,7 +2708,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2700,7 +2716,7 @@ msgstr ""
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
@@ -2750,18 +2766,17 @@ msgid "Scanning disc for index files..\n"
msgstr "A buscar os ficheiros de índices no disco..\n"
#: apt-pkg/cdrom.cc:671
-#, c-format
+#, fuzzy, c-format
msgid ""
"Found %i package indexes, %i source indexes, %i translation indexes and %i "
"signatures\n"
msgstr ""
-"Atopáronse %i índices de paquetes, %i índices de fontes, %i índices de "
-"traducións e %i sinaturas\n"
+"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n"
#: apt-pkg/cdrom.cc:708
-#, c-format
+#, fuzzy, c-format
msgid "Found label '%s'\n"
-msgstr "Atopouse a etiqueta \"%s\"\n"
+msgstr "Etiqueta armacenada: %s \n"
#: apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
@@ -2789,8 +2804,9 @@ msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de fontes deste disco son:\n"
#: apt-pkg/cdrom.cc:834
+#, fuzzy
msgid "Unmounting CD-ROM...\n"
-msgstr "A desmontar o CD-ROM...\n"
+msgstr "A desmontar o CD-ROM..."
#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
#, c-format
@@ -2814,52 +2830,52 @@ msgstr ""
"Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non "
"coinciden\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "A desempaquetar %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "A se preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Instalouse %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "A se preparar para a eliminación de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "A eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Eliminouse %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A se preparar para eliminar %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Eliminouse %s completamente"
diff --git a/po/he.po b/po/he.po
index df7e107ff..b192dd008 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -156,7 +156,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
@@ -554,7 +554,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -717,11 +717,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "רשימת המקורות לא ניתנת לקריאה."
@@ -750,7 +750,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "אין לך מספיק מקום פנוי ב-%s."
@@ -776,7 +776,7 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "בטל."
@@ -785,7 +785,7 @@ msgstr "בטל."
msgid "Do you want to continue [Y/n]? "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
@@ -794,7 +794,7 @@ msgstr "כשלון בהבאת %s %s\n"
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
@@ -921,7 +921,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -934,37 +934,37 @@ msgstr "שגיאה פנימית, כלשון ביצירת %s"
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "אבל %s הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -972,160 +972,175 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1379,9 +1394,9 @@ msgstr ""
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1674,7 +1689,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1701,39 +1716,39 @@ msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
@@ -1806,76 +1821,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr ""
@@ -1893,57 +1908,57 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:509
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %d)"
+msgid "Line %d too long (max %u)"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2010,6 +2025,7 @@ msgid "Unable to stat the mount point %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2252,7 +2268,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
@@ -2365,7 +2381,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:153
#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:178
@@ -2395,7 +2411,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:245
#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:251
@@ -2442,41 +2458,41 @@ msgstr ""
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, 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:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr ""
@@ -2582,52 +2598,52 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, fuzzy, c-format
msgid "Installed %s"
msgstr "מותקן:"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 251e3e6b5..87983ce7f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-21 11:04+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
@@ -658,7 +658,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -819,11 +819,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba, a rendezés nem zárult"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -852,7 +852,7 @@ msgstr "Kicsomagolás után %sB lemezterületet használok fel\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely itt: %s"
@@ -881,7 +881,7 @@ msgstr ""
"A folytatáshoz írd be ezt: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Megszakítva."
@@ -889,7 +889,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -898,7 +898,7 @@ msgstr "Sikertelen letöltés: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -1031,7 +1031,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
@@ -1044,31 +1044,31 @@ msgstr "Belső hiba, hibafeloldó gond"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "de csak %s telepíthető"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1076,7 +1076,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1088,7 +1088,7 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1098,118 +1098,133 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött '%s' fájl kihagyása\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1218,7 +1233,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1227,32 +1242,32 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1557,9 +1572,9 @@ msgstr "Csomagtalálat felülírása %s verziója nélkül"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "%s nem olvasható"
@@ -1858,7 +1873,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1885,39 +1900,39 @@ msgstr "Lekérdezés"
msgid "Unable to invoke "
msgstr "Nem lehet meghívni "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Csatlakozás: %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Kapcsolódás: %s"
@@ -1990,76 +2005,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba %s folyamattól"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Belső hiba"
@@ -2078,57 +2093,57 @@ msgstr "Nem sikerült %lu bájtot mmap-olni"
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ismeretlen típusrövidítés: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "%s konfigurációs fájl megnyitása"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "A(z) %d. sor túl hosszú (maximum %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik"
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
@@ -2196,6 +2211,7 @@ msgid "Unable to stat the mount point %s"
msgstr "%s csatolási pont nem érhető el"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Nem sikerült ide váltani: %s"
@@ -2442,7 +2458,7 @@ msgstr ""
"alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, "
"de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "A(z) '%s' indexfájltípus nem támogatott"
@@ -2559,8 +2575,8 @@ msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2589,8 +2605,8 @@ msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2643,21 +2659,21 @@ msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2666,7 +2682,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2675,14 +2691,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
@@ -2793,52 +2809,52 @@ msgstr "%i rekord kiírva %i hibásan párosított fájllal\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "%s előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "%s kicsomagolása"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfigurálásának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "%s konfigurálása"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Telepített %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "%s eltávolítása"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Eltávolított %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s teljes eltávolítása előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
diff --git a/po/it.po b/po/it.po
index 49fe11821..0b94d55bf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 09:27+0200\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -157,7 +157,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per %s %s compilato il %s %s\n"
@@ -657,7 +657,7 @@ msgstr "Impossibile rinominare %s in %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
@@ -821,11 +821,11 @@ msgstr "I pacchetti devono essere rimossi ma il remove disabilitato."
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non terminato"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non pu essere letta."
@@ -856,7 +856,7 @@ msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
@@ -887,7 +887,7 @@ msgstr ""
"Per continuare scrivere la frase '%s' \n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Interrotto."
@@ -895,7 +895,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
@@ -904,7 +904,7 @@ msgstr "Impossibile ottenere %s %s\n"
msgid "Some files failed to download"
msgstr "Il download di alcuni file fallito"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalit download-only"
@@ -1040,7 +1040,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
@@ -1053,32 +1053,32 @@ msgstr "Errore interno, problem resolver ha rotto qualcosa"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ma %s sta per essere installato"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
" consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1086,7 +1086,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1098,7 +1098,7 @@ msgstr ""
"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
"richiesti non sono ancora stati creati o rimossi da incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1108,117 +1108,132 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, problem resolver ha rotto qualcosa"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Si saltato il file gi scaricato '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non sufficiente"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr " necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr " necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Non stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
"dipendenze"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1227,7 +1242,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1251,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch nessuna versione "
"del pacchetto %s pu soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s "
" troppo nuovo"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s: %s fallita"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione fallito"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1578,9 +1593,9 @@ msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
@@ -1880,7 +1895,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati"
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1907,40 +1922,40 @@ msgstr "Query"
msgid "Unable to invoke "
msgstr "Impossibile invocare "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connessione a %s (%s) in corso"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Impossibile connettersi a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connessione a %s in corso"
@@ -2018,77 +2033,77 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Si ottenuto una singola linea di header su %u caratteri"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un Content-Length non valido"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un Content-Range non valido"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha il supporto del range bacato"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Errore interno"
@@ -2106,59 +2121,59 @@ msgstr "Impossibile eseguire mmap di %lu byte"
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tipo di abbreviazione non riconosciuto: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Apertura del file di configurazione %s in corso"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linea %d troppo lunga (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Errore di sintassi %s:%u: Il blocco inizia senza nome"
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Errore di sintassi %s:%u: Tag malformato"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Errore di sintassi %s:%u: Carattere extra dopo il valore"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Errore di sintassi %s:%u: Le direttive possono essere fatte solo al livello "
"pi alto"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Errore di sintassi %s:%u: Troppi include annidati"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Errore di sintassi %s:%u: Incluso da qui"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
@@ -2227,6 +2242,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Impossibile accedere al mount point %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Impossibile raggiungere %s"
@@ -2474,7 +2490,7 @@ msgstr ""
"essenziale %s a causa di un loop Conflitto/Pre-Dipendenza. Questo non "
"bene, ma se si vuole farlo, si attivi l'opzione APT::Force-LoopBreak "
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Il file indice di tipo '%s' non supportato"
@@ -2594,7 +2610,7 @@ msgstr "Errore nell'analisi di %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Errore nell'analisi di %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2624,7 +2640,7 @@ msgstr "Errore nell'analisi di %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Errore nell'analisi di %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2681,22 +2697,22 @@ msgstr "Il File Collezionato Fornisce"
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvataggio del cache sorgente"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2706,7 +2722,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2715,7 +2731,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2723,7 +2739,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
@@ -2834,52 +2850,52 @@ msgstr "Scritti %i record con %i file senza match\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Scritti %i record con %i file mancanti e %i file senza match\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Preparazione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Scompattamento di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparazione alla configurazione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Configurazione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s Installato"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparazione per la rimozione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s rimosso"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparazione alla rimozione totale di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Rimozione totale completata %s"
diff --git a/po/ja.po b/po/ja.po
index 30e683bd7..f8f9d6ce1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-08 19:57+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -159,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
@@ -657,7 +657,7 @@ msgstr "%s を %s に名前変更できませんでした"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -820,11 +820,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラー、調整が終わっていません"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
@@ -854,7 +854,7 @@ msgstr "展開後に追加で %sB のディスク容量が消費されます。\
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "展開後に %sB のディスク容量が解放されます。\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
@@ -883,7 +883,7 @@ msgstr ""
"続行するには、'%s' というフレーズをタイプしてください。\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "中断しました。"
@@ -891,7 +891,7 @@ msgstr "中断しました。"
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -900,7 +900,7 @@ msgstr "%s の取得に失敗しました %s\n"
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
@@ -1036,7 +1036,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
@@ -1049,33 +1049,33 @@ msgstr "内部エラー、問題リゾルバが何かを破壊しました"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "しかし、%s はインストールされようとしています"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
"ません:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1083,7 +1083,7 @@ msgstr ""
"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
"を明示してください)。"
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1095,7 +1095,7 @@ msgstr ""
"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
"動されていないことが考えられます。"
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1105,118 +1105,133 @@ msgstr ""
"可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n"
"さい。"
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "以下の特別パッケージがインストールされます:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "提案パッケージ:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "完了"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s に充分な空きスペースがありません"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1225,7 +1240,7 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1234,32 +1249,32 @@ msgstr ""
"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
"する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1569,9 +1584,9 @@ msgstr "%s に対するバージョンのないパッケージマッチを上書
msgid "File %s/%s overwrites the one in the package %s"
msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "%s を読み込むことができません"
@@ -1872,7 +1887,7 @@ msgstr "データソケット接続タイムアウト"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
@@ -1899,39 +1914,39 @@ msgstr "問い合わせ"
msgid "Unable to invoke "
msgstr "呼び出せません"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) へ接続しています"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s) への接続を開始できません。"
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s (%s) へ接続できませんでした。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "%s へ接続しています"
@@ -2005,76 +2020,76 @@ msgstr "%s に対してパイプを開けませんでした"
msgid "Read error from %s process"
msgstr "%s プロセスからの読み込みエラー"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "ヘッダの待機中です"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u 文字を超える 1 行のヘッダを取得しました"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "不正なヘッダ行です"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http サーバが不正なリプライヘッダを送信してきました"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http サーバのレンジサポートが壊れています"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "内部エラー"
@@ -2092,57 +2107,57 @@ msgstr "%lu バイトの mmap ができませんでした"
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "理解できない省略形式です: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "設定ファイル %s をオープンできませんでした"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "%d 行目が長すぎます (最大 %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "文法エラー %s:%u: 不正なタグです"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "文法エラー %s:%u: ここからインクルードされています"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
@@ -2209,6 +2224,7 @@ msgid "Unable to stat the mount point %s"
msgstr "マウントポイント %s の状態を取得できません"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "%s へ変更することができません"
@@ -2455,7 +2471,7 @@ msgstr ""
"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
@@ -2580,7 +2596,7 @@ msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2610,7 +2626,7 @@ msgstr "%s を処理中にエラーが発生しました (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2658,21 +2674,21 @@ msgstr "ファイル提供情報を収集しています"
msgid "IO Error saving source cache"
msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2681,7 +2697,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2690,7 +2706,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2698,7 +2714,7 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "サイズが適合しません"
@@ -2813,52 +2829,52 @@ msgstr ""
"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
"ファイルがあります。\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "%s を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "%s を展開しています"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "%s の設定を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "%s を設定しています"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s をインストールしました"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s の削除を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "%s を削除しています"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s を削除しました"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s を完全に削除する準備をしています"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
diff --git a/po/ko.po b/po/ko.po
index ce4dee022..f8f077717 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 21:22-0400\n"
"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -156,7 +156,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n"
@@ -654,7 +654,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -816,11 +816,11 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다.
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
@@ -851,7 +851,7 @@ msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
@@ -883,7 +883,7 @@ msgstr ""
"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "중단."
@@ -891,7 +891,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
@@ -900,7 +900,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
@@ -1035,7 +1035,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
@@ -1048,32 +1048,32 @@ msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "하지만 %s 꾸러미를 설치할 것입니다"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1081,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1101,115 +1101,130 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "망가진 꾸러미"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "다음 꾸러미를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1218,7 +1233,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1227,32 +1242,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1559,9 +1574,9 @@ msgstr "덮어 쓰는 꾸러미가 %s 꾸러미의 어떤 버전과도 맞지
msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
@@ -1859,7 +1874,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1886,39 +1901,39 @@ msgstr "질의"
msgid "Unable to invoke "
msgstr "다음을 실행할 수 없습니다: "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s에 연결할 수 없습니다 (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "%s에 연결하는 중입니다"
@@ -1990,76 +2005,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "내부 오류"
@@ -2077,57 +2092,57 @@ msgstr "%lu바이트를 mmap할 수 없습니다"
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "설정 파일 %s 파일을 여는 중입니다"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "%d번 줄이 너무 깁니다 (최대 %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "문법 오류 %s:%u: 여기서 include됩니다"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
@@ -2194,6 +2209,7 @@ msgid "Unable to stat the mount point %s"
msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "%s 디렉토리로 이동할 수 없습니다"
@@ -2440,7 +2456,7 @@ msgstr ""
"잠깐 지워야 합니다. 이 꾸러미를 지우는 건 좋지 않지만, 정말 지우려면 APT::"
"Force-LoopBreak 옵션을 켜십시오."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
@@ -2557,7 +2573,7 @@ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2587,7 +2603,7 @@ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2635,21 +2651,21 @@ msgstr "파일에서 제공하는 것을 모으는 중입니다"
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2658,7 +2674,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2667,14 +2683,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
@@ -2785,52 +2801,52 @@ msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "%s 준비 중"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "%s을(를) 푸는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "%s을(를) 설정할 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "%s 설정 중"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s 설치했음"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s을(를) 삭제할 준비 중"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "%s 지우는 중"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s 지움"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s을(를) 완전히 지웠습니다"
diff --git a/po/ku.po b/po/ku.po
deleted file mode 100644
index cc5669c33..000000000
--- a/po/ku.po
+++ /dev/null
@@ -1,2665 +0,0 @@
-# Kurdish translation for apt
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the apt package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
-"PO-Revision-Date: 2006-09-16 17:51+0100\n"
-"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
-"Language-Team: Kurdish <ku@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: cmdline/apt-cache.cc:143
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Pakêt nehate dîtin %s"
-
-#: cmdline/apt-cache.cc:247
-msgid "Total package names : "
-msgstr "Navên paketan bi giştî :"
-
-#: cmdline/apt-cache.cc:287
-msgid " Normal packages: "
-msgstr " Pakêtên normal:"
-
-#: cmdline/apt-cache.cc:288
-msgid " Pure virtual packages: "
-msgstr " Pakêtên farazî yên safî:"
-
-#: cmdline/apt-cache.cc:289
-msgid " Single virtual packages: "
-msgstr " Pakêta tenê ya farazî:"
-
-#: cmdline/apt-cache.cc:290
-msgid " Mixed virtual packages: "
-msgstr " Pakêtên hevbeş yên farazî:"
-
-#: cmdline/apt-cache.cc:291
-msgid " Missing: "
-msgstr " Winda: "
-
-#: cmdline/apt-cache.cc:293
-msgid "Total distinct versions: "
-msgstr "Guhertoyên vekirî yên giştî:"
-
-#: cmdline/apt-cache.cc:295
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Guhertoyên vekirî yên giştî:"
-
-#: cmdline/apt-cache.cc:297
-msgid "Total dependencies: "
-msgstr "Bindestên giştî:"
-
-#: cmdline/apt-cache.cc:300
-msgid "Total ver/file relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:302
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Guhertoyên vekirî yên giştî:"
-
-#: cmdline/apt-cache.cc:304
-msgid "Total Provides mappings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:316
-msgid "Total globbed strings: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:330
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:335
-msgid "Total slack space: "
-msgstr "Cihê giştî yê sist:"
-
-#: cmdline/apt-cache.cc:343
-msgid "Total space accounted for: "
-msgstr "Cihê giştî yê veqetandî: "
-
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
-#, c-format
-msgid "Package file %s is out of sync."
-msgstr "Pakêta dosya %s li derveyî demê ye."
-
-#: cmdline/apt-cache.cc:1293
-msgid "You must give exactly one pattern"
-msgstr "Pêwist e tu mînakekê bidî"
-
-#: cmdline/apt-cache.cc:1447
-msgid "No packages found"
-msgstr "Pakêt nayên dîtin"
-
-#: cmdline/apt-cache.cc:1524
-msgid "Package files:"
-msgstr "Pelgehên Pakêt:"
-
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
-msgid "Pinned packages:"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
-msgid "(not found)"
-msgstr "(nehate dîtin)"
-
-#. Installed version
-#: cmdline/apt-cache.cc:1577
-msgid " Installed: "
-msgstr " Sazkirî: "
-
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
-msgid "(none)"
-msgstr "(ne tiştek)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1584
-msgid " Candidate: "
-msgstr " Berendam: "
-
-#: cmdline/apt-cache.cc:1594
-msgid " Package pin: "
-msgstr " Destika pakêtê:"
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
-msgid " Version table:"
-msgstr " Tabloya guhertoyan:"
-
-#: cmdline/apt-cache.cc:1618
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
-
-#: cmdline/apt-cache.cc:1721
-msgid ""
-"Usage: apt-cache [options] command\n"
-" apt-cache [options] add file1 [file2 ...]\n"
-" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
-"\n"
-"Commands:\n"
-" add - Add a package file to the source cache\n"
-" gencaches - Build both the package and source cache\n"
-" showpkg - Show some general information for a single package\n"
-" showsrc - Show source records\n"
-" stats - Show some basic statistics\n"
-" dump - Show the entire file in a terse form\n"
-" dumpavail - Print an available file to stdout\n"
-" unmet - Show unmet dependencies\n"
-" search - Search the package list for a regex pattern\n"
-" show - Show a readable record for the package\n"
-" depends - Show raw dependency information for a package\n"
-" rdepends - Show reverse dependency information for a package\n"
-" pkgnames - List the names of all packages\n"
-" dotty - Generate package graphs for GraphVis\n"
-" xvcg - Generate package graphs for xvcg\n"
-" policy - Show policy settings\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -p=? The package cache.\n"
-" -s=? The source cache.\n"
-" -q Disable progress indicator.\n"
-" -i Show only important deps for the unmet command.\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'"
-
-#: cmdline/apt-cdrom.cc:93
-msgid "Please insert a Disc in the drive and press enter"
-msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-
-#: cmdline/apt-cdrom.cc:117
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
-
-#: cmdline/apt-config.cc:41
-msgid "Arguments not in pairs"
-msgstr ""
-
-#: cmdline/apt-config.cc:76
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-" shell - Shell mode\n"
-" dump - Show the configuration\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bikaranîn: apt-config [vebijark] ferman\n"
-"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
-"\n"
-"Ferman\n"
-" shell - moda shell\n"
-" dump - Mîhengan nîşan dide\n"
-"\n"
-"Vebijark:\n"
-" -h Ev dosyeya alîkariyê ye.\n"
-" -c=? Dosyeya mîhengan nîşan dide\n"
-" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
-"mînak -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s ne paketeke DEB ya derbasdar e."
-
-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -t Set the temp dir\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
-
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
-msgid "Package extension list is too long"
-msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Di şixulandina pêrista %s de çewtî"
-
-#: ftparchive/apt-ftparchive.cc:251
-msgid "Source extension list is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:368
-msgid "Error writing header to contents file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: ftparchive/apt-ftparchive.cc:398
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: ftparchive/apt-ftparchive.cc:553
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" --md5 Control MD5 generation\n"
-" -s=? Source override file\n"
-" -q Quiet\n"
-" -d=? Select the optional caching database\n"
-" --no-delink Enable delinking debug mode\n"
-" --contents Control contents file generation\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:759
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:832
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in"
-
-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
-
-#: ftparchive/cachedb.cc:61
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
-
-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:238
-msgid "Archive has no control record"
-msgstr "Tomara kontrola arşîvê tuneye"
-
-#: ftparchive/cachedb.cc:444
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:75
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: pelrêça %s nayê xwendin\n"
-
-#: ftparchive/writer.cc:80
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:131
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:133
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:140
-msgid "E: Errors apply to file "
-msgstr ""
-
-#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: ftparchive/writer.cc:169
-msgid "Tree walking failed"
-msgstr ""
-
-#: ftparchive/writer.cc:194
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s venebû"
-
-#: ftparchive/writer.cc:253
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr ""
-
-#: ftparchive/writer.cc:261
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:265
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:272
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr ""
-
-#: ftparchive/writer.cc:282
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:386
-msgid "Archive had no package field"
-msgstr "Di arşîvê de qada pakêtê tuneye"
-
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
-#, c-format
-msgid " %s has no override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
-#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:619
-#, c-format
-msgid " %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:623
-#, c-format
-msgid " %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:317
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
-
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
-msgid "realloc - Failed to allocate memory"
-msgstr ""
-
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s venebû"
-
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr ""
-
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr ""
-
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr ""
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:168 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
-
-#: ftparchive/multicompress.cc:194
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:197
-msgid "Failed to fork"
-msgstr ""
-
-#: ftparchive/multicompress.cc:211
-msgid "Compress child"
-msgstr ""
-
-#: ftparchive/multicompress.cc:234
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:285
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:320
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:359
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:402
-msgid "IO to subprocess/file failed"
-msgstr ""
-
-#: ftparchive/multicompress.cc:454
-msgid "Failed to read while computing MD5"
-msgstr ""
-
-#: ftparchive/multicompress.cc:471
-#, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:121
-msgid "Y"
-msgstr "E"
-
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:238
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: cmdline/apt-get.cc:328
-#, c-format
-msgid "but %s is installed"
-msgstr "lê %s sazkirî ye"
-
-#: cmdline/apt-get.cc:330
-#, c-format
-msgid "but %s is to be installed"
-msgstr "lê %s dê were sazkirin"
-
-#: cmdline/apt-get.cc:337
-msgid "but it is not installable"
-msgstr "lê sazkirina wê ne gengaz e"
-
-#: cmdline/apt-get.cc:339
-msgid "but it is a virtual package"
-msgstr "lê paketeke farazî ye"
-
-#: cmdline/apt-get.cc:342
-msgid "but it is not installed"
-msgstr "lê ne sazkirî ye"
-
-#: cmdline/apt-get.cc:342
-msgid "but it is not going to be installed"
-msgstr "lê dê neyê sazkirin"
-
-#: cmdline/apt-get.cc:347
-msgid " or"
-msgstr " û"
-
-#: cmdline/apt-get.cc:376
-msgid "The following NEW packages will be installed:"
-msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: cmdline/apt-get.cc:402
-msgid "The following packages will be REMOVED:"
-msgstr "Ev pakêt dê werine RAKIRIN:"
-
-#: cmdline/apt-get.cc:424
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: cmdline/apt-get.cc:445
-msgid "The following packages will be upgraded:"
-msgstr "Ev paket dê werine bilindkirin:"
-
-#: cmdline/apt-get.cc:466
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: cmdline/apt-get.cc:486
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:539
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (ji ber %s)"
-
-#: cmdline/apt-get.cc:547
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: cmdline/apt-get.cc:578
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: cmdline/apt-get.cc:582
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ji nû ve sazkirî"
-
-#: cmdline/apt-get.cc:584
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: cmdline/apt-get.cc:586
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:590
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:664
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: cmdline/apt-get.cc:667
-msgid " failed."
-msgstr " neserketî."
-
-#: cmdline/apt-get.cc:670
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:673
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: cmdline/apt-get.cc:675
-msgid " Done"
-msgstr " Temam"
-
-#: cmdline/apt-get.cc:679
-msgid "You might want to run `apt-get -f install' to correct these."
-msgstr ""
-
-#: cmdline/apt-get.cc:682
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: cmdline/apt-get.cc:704
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-
-#: cmdline/apt-get.cc:708
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:715
-msgid "Install these packages without verification [y/N]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:717
-msgid "Some packages could not be authenticated"
-msgstr ""
-
-#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:770
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: cmdline/apt-get.cc:779
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: cmdline/apt-get.cc:790
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
-msgid "Unable to lock the download directory"
-msgstr "Pelrêça daxistinê nayê quflekirin"
-
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
-#: apt-pkg/cachefile.cc:63
-msgid "The list of sources could not be read."
-msgstr ""
-
-#: cmdline/apt-get.cc:831
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-
-#: cmdline/apt-get.cc:836
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:839
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:844
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:847
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:864
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#: cmdline/apt-get.cc:881
-msgid "Yes, do as I say!"
-msgstr ""
-
-#: cmdline/apt-get.cc:883
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
-msgid "Abort."
-msgstr ""
-
-#: cmdline/apt-get.cc:904
-msgid "Do you want to continue [Y/n]? "
-msgstr ""
-
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
-#, c-format
-msgid "Failed to fetch %s %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:994
-msgid "Some files failed to download"
-msgstr ""
-
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
-msgid "Download complete and in download only mode"
-msgstr ""
-
-#: cmdline/apt-get.cc:1001
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: cmdline/apt-get.cc:1005
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: cmdline/apt-get.cc:1010
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: cmdline/apt-get.cc:1011
-msgid "Aborting install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1045
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1055
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1073
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1084
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1096
-msgid " [Installed]"
-msgstr " [Sazkirî]"
-
-#: cmdline/apt-get.cc:1101
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1106
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1125
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1128
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:1148
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1156
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1185
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: cmdline/apt-get.cc:1187
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
-
-#: cmdline/apt-get.cc:1193
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1330
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: cmdline/apt-get.cc:1343
-msgid "Unable to lock the list directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: cmdline/apt-get.cc:1433
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: cmdline/apt-get.cc:1465
-#, fuzzy
-msgid ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: cmdline/apt-get.cc:1467
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1472
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1479
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1498
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1543
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
-#, c-format
-msgid "Couldn't find package %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:1681
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1711
-#, fuzzy, c-format
-msgid "%s set to manual installed.\n"
-msgstr "lê %s dê were sazkirin"
-
-#: cmdline/apt-get.cc:1724
-msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1727
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: cmdline/apt-get.cc:1739
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: cmdline/apt-get.cc:1747
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-
-#: cmdline/apt-get.cc:1755
-msgid "Broken packages"
-msgstr "Paketên şikestî"
-
-#: cmdline/apt-get.cc:1784
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1873
-msgid "Suggested packages:"
-msgstr "Paketên tên pêşniyaz kirin:"
-
-#: cmdline/apt-get.cc:1874
-msgid "Recommended packages:"
-msgstr "Paketên tên tawsiyê kirin:"
-
-#: cmdline/apt-get.cc:1902
-msgid "Calculating upgrade... "
-msgstr ""
-
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
-msgid "Failed"
-msgstr "Serneket"
-
-#: cmdline/apt-get.cc:1910
-msgid "Done"
-msgstr "Temam"
-
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
-msgid "Internal error, problem resolver broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:2085
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2164
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2188
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2193
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2196
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2202
-#, c-format
-msgid "Fetch source %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2233
-msgid "Failed to fetch some archives."
-msgstr ""
-
-#: cmdline/apt-get.cc:2261
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2273
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2274
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2291
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2310
-msgid "Child process failed"
-msgstr ""
-
-#: cmdline/apt-get.cc:2326
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-
-#: cmdline/apt-get.cc:2354
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2374
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2426
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-
-#: cmdline/apt-get.cc:2478
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-msgstr ""
-
-#: cmdline/apt-get.cc:2513
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-
-#: cmdline/apt-get.cc:2538
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2552
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-
-#: cmdline/apt-get.cc:2556
-msgid "Failed to process build dependencies"
-msgstr ""
-
-#: cmdline/apt-get.cc:2588
-msgid "Supported modules:"
-msgstr ""
-
-#: cmdline/apt-get.cc:2629
-msgid ""
-"Usage: apt-get [options] command\n"
-" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-" apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-" update - Retrieve new lists of packages\n"
-" upgrade - Perform an upgrade\n"
-" install - Install new packages (pkg is libc6 not libc6.deb)\n"
-" remove - Remove packages\n"
-" purge - Remove and purge packages\n"
-" source - Download source archives\n"
-" build-dep - Configure build-dependencies for source packages\n"
-" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-" dselect-upgrade - Follow dselect selections\n"
-" clean - Erase downloaded archive files\n"
-" autoclean - Erase old downloaded archive files\n"
-" check - Verify that there are no broken dependencies\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -q Loggable output - no progress indicator\n"
-" -qq No output except for errors\n"
-" -d Download only - do NOT install or unpack archives\n"
-" -s No-act. Perform ordering simulation\n"
-" -y Assume Yes to all queries and do not prompt\n"
-" -f Attempt to continue if the integrity check fails\n"
-" -m Attempt to continue if archives are unlocatable\n"
-" -u Show a list of upgraded packages as well\n"
-" -b Build the source package after fetching it\n"
-" -V Show verbose version numbers\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-" This APT has Super Cow Powers.\n"
-msgstr ""
-
-#: cmdline/acqprogress.cc:55
-msgid "Hit "
-msgstr ""
-
-#: cmdline/acqprogress.cc:79
-msgid "Get:"
-msgstr ""
-
-#: cmdline/acqprogress.cc:110
-msgid "Ign "
-msgstr ""
-
-#: cmdline/acqprogress.cc:114
-msgid "Err "
-msgstr ""
-
-#: cmdline/acqprogress.cc:135
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: cmdline/acqprogress.cc:225
-#, c-format
-msgid " [Working]"
-msgstr " [Dixebite]"
-
-#: cmdline/acqprogress.cc:271
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:150
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -s Use source file sorting\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr ""
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
-msgid "Press enter to continue."
-msgstr ""
-
-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr ""
-
-#: dselect/install:101
-msgid "packages that were installed. This may result in duplicate errors"
-msgstr ""
-
-#: dselect/install:102
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-
-#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:114
-#, fuzzy
-msgid "Failed to create pipes"
-msgstr "%s ji hev nehate veçirandin"
-
-#: apt-inst/contrib/extracttar.cc:141
-#, fuzzy
-msgid "Failed to exec gzip "
-msgstr "%s ji hev nehate veçirandin"
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:296
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:128
-#, fuzzy
-msgid "Archive is too short"
-msgstr "Tomara kontrola arşîvê tuneye"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr ""
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr ""
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
-
-#: apt-inst/filelist.cc:459
-#, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "%s venebû"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr ""
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr ""
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
-#, fuzzy, c-format
-msgid "Failed to close file %s"
-msgstr "%s venebû"
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, fuzzy, c-format
-msgid "The path %s is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr ""
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr ""
-
-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-#, fuzzy
-msgid "The diversion path is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr ""
-
-#: apt-inst/extract.cc:431
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
-
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
-#, fuzzy, c-format
-msgid "Unable to read %s"
-msgstr "%s venebû"
-
-#: apt-inst/extract.cc:491
-#, fuzzy, c-format
-msgid "Unable to stat %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, fuzzy, c-format
-msgid "Failed to remove %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, fuzzy, c-format
-msgid "Unable to create %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-inst/deb/dpkgdb.cc:114
-#, fuzzy, c-format
-msgid "Failed to stat %sinfo"
-msgstr "%s venebû"
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr ""
-
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Paketên şikestî"
-
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:108
-#, c-format
-msgid "Couldn't change to %s"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:134
-msgid "Internal error, could not locate member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:167
-msgid "Failed to locate a valid control file"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:252
-msgid "Unparsable control file"
-msgstr ""
-
-#: methods/cdrom.cc:114
-#, fuzzy, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Pakêt nehate dîtin %s"
-
-#: methods/cdrom.cc:123
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-
-#: methods/cdrom.cc:131
-msgid "Wrong CD-ROM"
-msgstr ""
-
-#: methods/cdrom.cc:166
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-
-#: methods/cdrom.cc:171
-#, fuzzy
-msgid "Disk not found."
-msgstr "(nehate dîtin)"
-
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
-#, fuzzy
-msgid "File not found"
-msgstr "(nehate dîtin)"
-
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
-#, fuzzy
-msgid "Failed to stat"
-msgstr "%s venebû"
-
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
-#: methods/rred.cc:240
-msgid "Failed to set modification time"
-msgstr ""
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
-msgid "Logging in"
-msgstr ""
-
-#: methods/ftp.cc:168
-msgid "Unable to determine the peer name"
-msgstr ""
-
-#: methods/ftp.cc:173
-#, fuzzy
-msgid "Unable to determine the local name"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: methods/ftp.cc:204 methods/ftp.cc:232
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr ""
-
-#: methods/ftp.cc:210
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:217
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-
-#: methods/ftp.cc:265
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:291
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr ""
-
-#: methods/ftp.cc:335
-msgid "Server closed the connection"
-msgstr ""
-
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
-msgid "Read error"
-msgstr ""
-
-#: methods/ftp.cc:345 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr ""
-
-#: methods/ftp.cc:362 methods/ftp.cc:374
-msgid "Protocol corruption"
-msgstr ""
-
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
-msgid "Write error"
-msgstr ""
-
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
-msgid "Could not create a socket"
-msgstr ""
-
-#: methods/ftp.cc:698
-msgid "Could not connect data socket, connection timed out"
-msgstr ""
-
-#: methods/ftp.cc:704
-msgid "Could not connect passive socket."
-msgstr ""
-
-#: methods/ftp.cc:722
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
-
-#: methods/ftp.cc:736
-msgid "Could not bind a socket"
-msgstr ""
-
-#: methods/ftp.cc:740
-msgid "Could not listen on the socket"
-msgstr ""
-
-#: methods/ftp.cc:747
-msgid "Could not determine the socket's name"
-msgstr ""
-
-#: methods/ftp.cc:779
-msgid "Unable to send PORT command"
-msgstr ""
-
-#: methods/ftp.cc:789
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr ""
-
-#: methods/ftp.cc:798
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr ""
-
-#: methods/ftp.cc:818
-msgid "Data socket connect timed out"
-msgstr ""
-
-#: methods/ftp.cc:825
-msgid "Unable to accept connection"
-msgstr ""
-
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr ""
-
-#: methods/ftp.cc:877
-#, fuzzy, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: methods/ftp.cc:892 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr ""
-
-#: methods/ftp.cc:922
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr ""
-
-#. Get the files information
-#: methods/ftp.cc:997
-msgid "Query"
-msgstr ""
-
-#: methods/ftp.cc:1109
-#, fuzzy
-msgid "Unable to invoke "
-msgstr "%s venebû"
-
-#: methods/connect.cc:64
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr ""
-
-#: methods/connect.cc:71
-#, c-format
-msgid "[IP: %s %s]"
-msgstr ""
-
-#: methods/connect.cc:80
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
-
-#: methods/connect.cc:86
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
-
-#: methods/connect.cc:93
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-
-#: methods/connect.cc:108
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr ""
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr ""
-
-#: methods/connect.cc:167
-#, fuzzy, c-format
-msgid "Could not resolve '%s'"
-msgstr "%s ji hev nehate veçirandin"
-
-#: methods/connect.cc:173
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr ""
-
-#: methods/connect.cc:176
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr ""
-
-#: methods/connect.cc:223
-#, fuzzy, c-format
-msgid "Unable to connect to %s %s:"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: methods/gpgv.cc:65
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr ""
-
-#: methods/gpgv.cc:100
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:204
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:209
-msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#: methods/gpgv.cc:213
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr ""
-
-#: methods/gpgv.cc:218
-msgid "Unknown error executing gpgv"
-msgstr ""
-
-#: methods/gpgv.cc:249
-#, fuzzy
-msgid "The following signatures were invalid:\n"
-msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: methods/gpgv.cc:256
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
-#: methods/http.cc:377
-msgid "Waiting for headers"
-msgstr ""
-
-#: methods/http.cc:523
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr ""
-
-#: methods/http.cc:531
-msgid "Bad header line"
-msgstr ""
-
-#: methods/http.cc:550 methods/http.cc:557
-msgid "The HTTP server sent an invalid reply header"
-msgstr ""
-
-#: methods/http.cc:586
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
-
-#: methods/http.cc:601
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
-
-#: methods/http.cc:603
-msgid "This HTTP server has broken range support"
-msgstr ""
-
-#: methods/http.cc:627
-msgid "Unknown date format"
-msgstr ""
-
-#: methods/http.cc:774
-#, fuzzy
-msgid "Select failed"
-msgstr " neserketî."
-
-#: methods/http.cc:779
-msgid "Connection timed out"
-msgstr ""
-
-#: methods/http.cc:802
-#, fuzzy
-msgid "Error writing to output file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: methods/http.cc:833
-#, fuzzy
-msgid "Error writing to file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: methods/http.cc:861
-#, fuzzy
-msgid "Error writing to the file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: methods/http.cc:875
-msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-
-#: methods/http.cc:877
-msgid "Error reading from server"
-msgstr ""
-
-#: methods/http.cc:1108
-msgid "Bad header data"
-msgstr ""
-
-#: methods/http.cc:1125
-msgid "Connection failed"
-msgstr ""
-
-#: methods/http.cc:1216
-msgid "Internal error"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:78
-msgid "Can't mmap an empty file"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:83
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:978
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:433
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:491
-#, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:605
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:624
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:641
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:681
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:688
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:701
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:735
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:152
-#, c-format
-msgid "%c%s... Error!"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:154
-#, c-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
-#, c-format
-msgid "Option %s requires an argument."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:234
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:265
-#, fuzzy, c-format
-msgid "Option '%s' is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: apt-pkg/contrib/cmndline.cc:298
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:348
-#, c-format
-msgid "Invalid operation %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:52
-#, fuzzy, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#, fuzzy, c-format
-msgid "Unable to change to %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/contrib/cdromutl.cc:187
-msgid "Failed to stat the cdrom"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:80
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:85
-#, fuzzy, c-format
-msgid "Could not open lock file %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: apt-pkg/contrib/fileutl.cc:103
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:107
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:375
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:385
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:388
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:390
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:434
-#, fuzzy, c-format
-msgid "Could not open file %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: apt-pkg/contrib/fileutl.cc:490
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:520
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:595
-msgid "Problem closing the file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:601
-msgid "Problem unlinking the file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:612
-msgid "Problem syncing the file"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:132
-msgid "Empty package cache"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:138
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:143
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:148
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:153
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:224
-msgid "Depends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:224
-msgid "PreDepends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:224
-msgid "Suggests"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:225
-#, fuzzy
-msgid "Recommends"
-msgstr "Paketên tên tawsiyê kirin:"
-
-#: apt-pkg/pkgcache.cc:225
-msgid "Conflicts"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:225
-msgid "Replaces"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:226
-msgid "Obsoletes"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:226
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:237
-msgid "important"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:237
-msgid "required"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:237
-msgid "standard"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:238
-msgid "optional"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:238
-msgid "extra"
-msgstr ""
-
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:101
-#, fuzzy
-msgid "Candidate versions"
-msgstr " Berendam: "
-
-#: apt-pkg/depcache.cc:130
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
-msgid "Reading state information"
-msgstr ""
-
-#: apt-pkg/depcache.cc:198
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s venebû"
-
-#: apt-pkg/depcache.cc:204
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: apt-pkg/tagfile.cc:102
-#, fuzzy, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/tagfile.cc:189
-#, fuzzy, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/sourcelist.cc:90
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:101
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:108
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Opening %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:236
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:240
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:399
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:34
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/algorithms.cc:247
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1103
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1105
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-
-#: apt-pkg/acquire.cc:59
-#, c-format
-msgid "Lists directory %spartial is missing."
-msgstr ""
-
-#: apt-pkg/acquire.cc:63
-#, c-format
-msgid "Archive directory %spartial is missing."
-msgstr ""
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:827
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:829
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:110
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:381
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-
-#: apt-pkg/init.cc:126
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/init.cc:142
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/clean.cc:57
-#, fuzzy, c-format
-msgid "Unable to stat %s."
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-
-#: apt-pkg/cachefile.cc:69
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-
-#: apt-pkg/cachefile.cc:73
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
-msgstr ""
-
-#: apt-pkg/policy.cc:289
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:297
-msgid "No priority (or zero) specified for pin"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:72
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:115
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:130
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:153
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:178
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:182
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:213
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:217
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:221
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:288
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:301
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:307
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:678
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:763
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:127
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
-msgid "MD5Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1106
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1219
-#, 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:1278
-#, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1314
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1401
-msgid "Size mismatch"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:66
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:529
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:563
-#, c-format
-msgid "Stored label: %s \n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:583
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:601
-msgid "Unmounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:605
-msgid "Waiting for disc...\n"
-msgstr ""
-
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:613
-msgid "Mounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:631
-msgid "Scanning disc for index files..\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:671
-#, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:708
-#, c-format
-msgid "Found label '%s'\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:737
-msgid "That is not a valid name, try again.\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:753
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:757
-msgid "Copying package lists..."
-msgstr ""
-
-#: apt-pkg/cdrom.cc:783
-msgid "Writing new source list\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:792
-msgid "Source list entries for this disc are:\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:834
-msgid "Unmounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:355
-#, c-format
-msgid "Preparing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:356
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:361
-#, c-format
-msgid "Preparing to configure %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:362
-#, c-format
-msgid "Configuring %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:363
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr " Sazkirî: "
-
-#: apt-pkg/deb/dpkgpm.cc:368
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:369
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:370
-#, c-format
-msgid "Removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:375
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:376
-#, c-format
-msgid "Completely removed %s"
-msgstr ""
-
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
diff --git a/po/nb.po b/po/nb.po
index c68a80aaa..78e78e430 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-16 00:35+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -168,7 +168,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
@@ -667,7 +667,7 @@ msgstr "Klarte ikke endre navnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulrt uttrykk - %s"
@@ -828,11 +828,11 @@ msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil, sortering fullfrte ikke"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Klarer ikke lse nedlastingsmappa"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -863,7 +863,7 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -893,7 +893,7 @@ msgstr ""
"For fortsette skriv inn teksten %s\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Avbryter."
@@ -901,7 +901,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke skaffe %s %s\n"
@@ -910,7 +910,7 @@ msgstr "Klarte ikke skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
@@ -1045,7 +1045,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
@@ -1058,31 +1058,31 @@ msgstr "Intern feil, problemlser dela noe"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "men %s skal installeres"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1090,7 +1090,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1102,7 +1102,7 @@ msgstr ""
"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1112,122 +1112,137 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du br fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Utfrt"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, problemlser dela noe"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Du m angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil %s\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken dpkg-dev er installert.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m angi minst en pakke du vil sjekke builddeps for"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1251,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1570,9 +1585,9 @@ msgstr "Skriver over pakketreff uten versjon for %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke lese %s"
@@ -1875,7 +1890,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1902,39 +1917,39 @@ msgstr "Sprring"
msgid "Unable to invoke "
msgstr "Klarte ikke starte"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Kobler til %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Klarte ikke opprette en sokkel for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Klarte ikke starte forbindelsen til %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikke koble til %s:%s (%s), tidsavbrudd p forbindelsen"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikke koble til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Kobler til %s"
@@ -2009,76 +2024,76 @@ msgstr "Klarte ikke pne rr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Venter p hoder"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "delagt hodelinje"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Intern feil"
@@ -2096,57 +2111,57 @@ msgstr "Kunne ikke lage mmap av %lu bytes"
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukjent typeforkortelse: %c"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "pner oppsettsfila %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linje %d er for lang (maks %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfeil %s:%u: Feil p taggen"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfeil %s:%u: For mange nstede inkluderte filer"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfeil %s:%u: Inkludert herfra"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila"
@@ -2213,6 +2228,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Klarer ikke fastsette monteringspunktet %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Klarer ikke endre %s"
@@ -2459,7 +2475,7 @@ msgstr ""
"s pga. en konflikt/forutsettelses-lkke. Dette er ofte stygt, men hvis du "
"virkelig vil det, s bruk innstillingen APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Oversiktsfil av typen %s stttes ikke"
@@ -2577,7 +2593,7 @@ msgstr "Feil oppsto under behandling av %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2607,7 +2623,7 @@ msgstr "Feil oppsto under behandling av %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2655,22 +2671,22 @@ msgstr "Samler inn filtilbud"
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2679,7 +2695,7 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2688,13 +2704,13 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Feil strrelse"
@@ -2805,52 +2821,52 @@ msgstr "Skrev %i poster med %i feile filer.\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Forbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Pakker ut %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Forbereder konfigurering %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Konfigurer %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Installerte %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Forbereder fjerning av %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Fjernet %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Forbereder fullstendig slette %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
diff --git a/po/nl.po b/po/nl.po
index 05b1bbe6a..4356b3c3b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-17 22:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s voor %s %s gecompileerd op %s %s\n"
@@ -662,7 +662,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -824,11 +824,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout, rangschikken is niet voltooid"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -859,7 +859,7 @@ msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -888,7 +888,7 @@ msgstr ""
"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Afbreken."
@@ -896,7 +896,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -905,7 +905,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -1042,7 +1042,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
@@ -1055,33 +1055,33 @@ msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "maar %s zal genstalleerd worden"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1089,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1100,7 +1100,7 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1110,119 +1110,134 @@ msgstr ""
"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
"best een foutrapport indienen voor dit pakket."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket genstalleerd is.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste n pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1246,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1255,32 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: genstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1583,9 +1598,9 @@ msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
@@ -1888,7 +1903,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1915,39 +1930,39 @@ msgstr "Zoekopdracht"
msgid "Unable to invoke "
msgstr "Aanroepen mislukt van "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kon niet verbinden met %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Er wordt verbinding gemaakt met %s"
@@ -2027,79 +2042,79 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Interne fout"
@@ -2117,59 +2132,59 @@ msgstr "Kon van %lu bytes geen mmap maken"
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Onbekende typeafkorting '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Configuratiebestand %s wordt geopend"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Regel %d is te lang (maxl %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfout %s:%u: Blok start zonder naam."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven "
"worden"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
@@ -2238,6 +2253,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Kan %s niet veranderen"
@@ -2488,7 +2504,7 @@ msgstr ""
"slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie te "
"activeren."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indexbestandtype '%s' wordt niet ondersteund"
@@ -2611,7 +2627,7 @@ msgstr "Fout tijdens verwerken van %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2641,7 +2657,7 @@ msgstr "Fout tijdens verwerken van %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2691,22 +2707,22 @@ msgstr "Voorziene bestanden worden verzameld"
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2715,7 +2731,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2724,7 +2740,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2732,7 +2748,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
@@ -2845,52 +2861,52 @@ msgstr ""
"%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
"bestanden\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "%s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "%s wordt uitgepakt"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Configuratie van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "%s wordt geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s is genstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "%s wordt verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s is verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Volledige verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
diff --git a/po/nn.po b/po/nn.po
index 0da77a50e..6d69e25f7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+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"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
@@ -658,7 +658,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -822,11 +822,11 @@ msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -855,7 +855,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -885,7 +885,7 @@ msgstr ""
"For halda fram, m du skriva nyaktig %s.\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Avbryt."
@@ -893,7 +893,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -902,7 +902,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -1038,7 +1038,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
@@ -1051,32 +1051,32 @@ msgstr "Intern feil. AllUpgrade ydelagde noko"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1084,7 +1084,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1096,7 +1096,7 @@ msgstr ""
"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1106,123 +1106,138 @@ msgstr ""
"pakken rett og slett ikkje lt seg installera. I sfall br du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,31 +1246,31 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1562,9 +1577,9 @@ msgstr "Skriv over pakketreff utan versjon for %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
@@ -1867,7 +1882,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1894,39 +1909,39 @@ msgstr "Sprjing"
msgid "Unable to invoke "
msgstr "Klarte ikkje starta "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Koplar til %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p sambandet"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikkje kopla til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Koplar til %s"
@@ -1999,76 +2014,76 @@ msgstr "Klarte ikkje opna ryr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fr %s-prosessen"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Intern feil"
@@ -2086,57 +2101,57 @@ msgstr "Klarte ikkje laga mmap av %lu byte"
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukjend typeforkorting: %c"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linja %d er for lang (maks %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfeil %s:%u: Misforma tagg"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfeil %s:%u: Inkludert herifr"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
@@ -2203,6 +2218,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Klarte ikkje f status til monteringspunktet %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Klarte ikkje byta til %s"
@@ -2450,7 +2466,7 @@ msgstr ""
"om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-"
"LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiltypen %s er ikkje sttta"
@@ -2570,7 +2586,7 @@ msgstr "Feil ved behandling av %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Feil ved behandling av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2600,7 +2616,7 @@ msgstr "Feil ved behandling av %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Feil ved behandling av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2648,21 +2664,21 @@ msgstr "Samlar inn filtilbod"
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2671,7 +2687,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2679,14 +2695,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Feil storleik"
@@ -2797,52 +2813,52 @@ msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Koplar til %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Tilrdingar"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
diff --git a/po/pl.po b/po/pl.po
index 92c805033..6ec253af4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-01-23 15:32+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -157,7 +157,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s dla %s %s skompilowany %s %s\n"
@@ -654,7 +654,7 @@ msgstr "Nie udao si zmieni nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Bd kompilacji wyraenia regularnego - %s"
@@ -815,11 +815,11 @@ msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone."
msgid "Internal error, Ordering didn't finish"
msgstr "Bd wewntrzny, sortowanie niezakoczone"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Nie udao si zablokowa katalogu pobierania"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Nie udao si odczyta list rde."
@@ -848,7 +848,7 @@ msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udao si ustali iloci wolnego miejsca w %s"
@@ -877,7 +877,7 @@ msgstr ""
"Aby kontynuowa wpisz zdanie '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Przerwane."
@@ -885,7 +885,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Czy chcesz kontynuowa [T/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udao si pobra %s %s\n"
@@ -894,7 +894,7 @@ msgstr "Nie udao si pobra %s %s\n"
msgid "Some files failed to download"
msgstr "Nie udao si pobra niektrych plikw"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Ukoczono pobieranie w trybie samego pobierania"
@@ -1030,7 +1030,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:"
@@ -1043,31 +1043,31 @@ msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Nie udao si odnale pakietu %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udao si odnale pakietu %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ale %s ma zosta zainstalowany"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1075,7 +1075,7 @@ msgstr ""
"Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub "
"podaj rozwizanie)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1087,7 +1087,7 @@ msgstr ""
"w ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"Przychodzce\")."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1097,120 +1097,135 @@ msgstr ""
"danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n"
"bd."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pakiety s bdne"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Nie udao si"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane "
"rda"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udao si odnale rda dla pakietu %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie ju pobranego pliku '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiww rde.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiww rde.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz rdo %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Nie udao si pobra niektrych archiww."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Proces potomny zawid"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety "
"wymagane do budowania"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie udao si pobra informacji o zalenociach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zalenoci czasu budowania.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1219,7 +1234,7 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,32 +1243,32 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udao si speni zalenoci %s od %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udao si speni zalenoci na czas budowania od %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Nie udao si przetworzy zalenoci na czas budowania"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Obsugiwane moduy:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1564,9 +1579,9 @@ msgstr "Dopasowanie dla %s nadpisujcego pakietu bez wersji"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Nie mona czyta %s"
@@ -1866,7 +1881,7 @@ msgstr "Przekroczony czas poczenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udao si przyj poczenia"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udao si obliczy skrtu pliku"
@@ -1893,39 +1908,39 @@ msgstr "Info"
msgid "Unable to invoke "
msgstr "Nie mona wywoa "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Podczanie do %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nie udao si utworzy gniazda dla %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nie udao si zainicjalizowa poczenia z %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nie udao si poczy z %s:%s (%s), przekroczenie czasu poczenia"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nie udao si poczy z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "czenie z %s"
@@ -2001,76 +2016,76 @@ msgstr "Nie udao si otworzy potoku dla %s"
msgid "Read error from %s process"
msgstr "Bd odczytu z procesu %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagwki"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Nieprawidowa linia nagwka"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Operacja select nie powioda si"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Przekroczenie czasu poczenia"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Bd przy pisaniu do pliku wyjciowego"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Bd czytania z serwera"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Bdne dane nagwka"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Poczenie nie udao si"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Bd wewntrzny"
@@ -2088,58 +2103,58 @@ msgstr "Nie udao si wykona mmap %lu bajtw"
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nierozpoznany skrt typu: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Otwieranie pliku konfiguracyjnego %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linia %d jest zbyt duga (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Bd skadniowy %s:%u: Blok nie zaczyna si nazw."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Bd skadniowy %s:%u: Bdny znacznik"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Bd skadniowy %s:%u: Po wartoci wystpuj mieci"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Bd skadniowy %s:%u: Dyrektywy mog wystpowa tylko na poziomie najwyszym"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Bd skadniowy %s:%u: Zbyt wiele zagniedonych operacji include"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Bd skadniowy %s:%u: Wczony tutaj"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Bd skadniowy %s:%u: Nieobsugiwana dyrektywa '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Bd skadniowy %s:%u: mieci na kocu pliku"
@@ -2206,6 +2221,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Nie udao si wykona operacji stat na punkcie montowania %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Nie udao si przej do %s"
@@ -2453,7 +2469,7 @@ msgstr ""
"nic dobrego, ale jeli naprawd chcesz to zrobi, wcz opcj APT::Force-"
"LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Plik indeksu typu '%s' nie jest obsugiwany"
@@ -2568,8 +2584,8 @@ msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Wystpi bd podczas przetwarzania %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2598,8 +2614,8 @@ msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Wystpi bd podczas przetwarzania %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2649,22 +2665,22 @@ msgstr "Zbieranie zapewnie plikw"
msgid "IO Error saving source cache"
msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udao si zmieni nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2673,7 +2689,7 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2682,14 +2698,14 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Bdny rozmiar"
@@ -2802,52 +2818,52 @@ msgstr "Zapisano %i rekordw z %i niepasujcymi plikami\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekordw z %i brakujcymi plikami i %i niepasujcymi\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Przygotowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Rozpakowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Przygotowanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Konfigurowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr " Zainstalowany %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Przygotowanie do usunicia %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Usunito %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Przygotowanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Nie udao si usun %s"
diff --git a/po/pt.po b/po/pt.po
index 7b8440612..fa01380d2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-05-09 22:14+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -159,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
@@ -657,7 +657,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -818,11 +818,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -853,7 +853,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossível de determinar espaço livre em %s"
@@ -882,7 +882,7 @@ msgstr ""
"Para continuar escreva a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abortado."
@@ -890,7 +890,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Você deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
@@ -899,7 +899,7 @@ msgstr "Falha ao obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
@@ -1035,7 +1035,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
@@ -1048,31 +1048,31 @@ msgstr "Erro Interno, o solucionador de problemas estragou coisas"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1080,7 +1080,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
"criados ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1103,119 +1103,134 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se obtenha o código fonte"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1239,7 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1248,32 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1570,9 +1585,9 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1871,7 +1886,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1898,39 +1913,39 @@ msgstr "Pesquisa"
msgid "Unable to invoke "
msgstr "Impossível invocar "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Ligando a %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Não posso iniciar a ligação para %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível ligar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Ligando a %s"
@@ -2009,76 +2024,76 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Erro interno"
@@ -2096,58 +2111,58 @@ msgstr "Impossível fazer mmap de %lu bytes"
msgid "Selection %s not found"
msgstr "Selecção %s não encontrada"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviatura de tipo desconhecida: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Abrindo ficheiro de configuração %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linha %d é demasiado longa (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Tag Malformada"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Muitos includes encadeados"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
@@ -2215,6 +2230,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Impossível executar stat ao ponto de montagem %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Impossível mudar para %s"
@@ -2462,7 +2478,7 @@ msgstr ""
"normalmente é mau, mas se você quer realmente fazer isso, active a opção "
"APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Tipo do ficheiro de índice '%s' não é suportado"
@@ -2583,7 +2599,7 @@ msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2613,7 +2629,7 @@ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2667,23 +2683,23 @@ msgstr "Obtendo File Provides"
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2693,7 +2709,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2702,7 +2718,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2710,7 +2726,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
@@ -2822,52 +2838,52 @@ msgstr ""
"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
"coincidentes\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "A desempacotar %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "A preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "A preparar para remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A preparar para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5917df80b..7d0bbf657 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-08-21 00:40-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
@@ -658,7 +658,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -820,11 +820,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no diretório de download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -854,7 +854,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -883,7 +883,7 @@ msgstr ""
"Para continuar digite a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abortar."
@@ -891,7 +891,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Quer continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao buscar %s %s\n"
@@ -900,7 +900,7 @@ msgstr "Falha ao buscar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -1035,7 +1035,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "A informação a seguir pode ajudar a resolver a situação:"
@@ -1048,31 +1048,31 @@ msgstr "Erro interno, o solucionador de problemas quebrou coisas"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1080,7 +1080,7 @@ msgstr ""
"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram\n"
"criados ainda ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1102,117 +1102,132 @@ msgstr ""
"esteja simplesmente não instalável e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando arquivo já obtido '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Falha ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1221,7 +1236,7 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1230,32 +1245,32 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão "
"disponível do pacote %s pôde satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Módulos suportados:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1568,9 +1583,9 @@ msgstr "Sobreescrita de pacote não casa com nenhuma versão para %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1870,7 +1885,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
@@ -1897,39 +1912,39 @@ msgstr "Pesquisa"
msgid "Unable to invoke "
msgstr "Impossível invocar "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando em %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Não posso iniciar a conexão para %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível conectar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
@@ -2008,76 +2023,76 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte a range quebrado"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de saída"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Erro interno"
@@ -2095,58 +2110,58 @@ msgstr "Impossível fazer mmap de %lu bytes"
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviação de tipo desconhecida: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Abrindo arquivo de configuração %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linha %d muito longa (máx. %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Tag mal formada"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Muitos includes aninhados"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
@@ -2214,6 +2229,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Impossível checar o ponto de montagem %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Impossível mudar para %s"
@@ -2462,7 +2478,7 @@ msgstr ""
"é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
"LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Tipo de arquivo de índice '%s' não é suportado"
@@ -2583,7 +2599,7 @@ msgstr "Um erro ocorreu processando %s (UsePacote1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2613,7 +2629,7 @@ msgstr "Um erro ocorreu processando %s (NovaVersão2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2667,21 +2683,21 @@ msgstr "Coletando Arquivo Provides"
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar cache fonte"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2691,7 +2707,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2700,7 +2716,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2708,7 +2724,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2823,52 +2839,52 @@ msgstr ""
"Gravados %i registros com %i arquivos faltando e %i arquivos que não "
"combinam\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Desempacotando %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparando para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparando para a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Removendo %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparando para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s completamente removido"
diff --git a/po/ro.po b/po/ro.po
index ba80d5c5f..037508c8c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-19 01:35+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -159,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pentru %s %s compilat pe %s %s\n"
@@ -664,7 +664,7 @@ msgstr "Eşuare în a redenumi %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -825,11 +825,11 @@ msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -859,7 +859,7 @@ msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spaţiul disponibil în %s"
@@ -889,7 +889,7 @@ msgstr ""
"Pentru a continua tastaţi fraza '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Renunţare."
@@ -897,7 +897,7 @@ msgstr "Renunţare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreţi să continuaţi [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
@@ -906,7 +906,7 @@ msgstr "Eşuare în aducerea %s %s\n"
msgid "Some files failed to download"
msgstr "Eşuare în descărcarea unor fişiere"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
@@ -1040,7 +1040,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
@@ -1054,31 +1054,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "dar %s este pe cale de a fi instalat"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1086,7 +1086,7 @@ msgstr ""
"Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet "
"(sau oferiţi o altă soluţie)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1099,7 +1099,7 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1109,118 +1109,133 @@ msgstr ""
" că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n"
"acest pachet ar trebui completat."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Eşuare"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puţin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu pot găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fişierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveţi suficient spaţiu în %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele "
"înglobate"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informaţiile despre dependenţele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1244,7 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1238,32 +1253,32 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependenţele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1576,9 +1591,9 @@ msgstr "Pachetul suprascris nu se potriveşte cu nici o versiune pentru %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Nu pot citi %s"
@@ -1879,7 +1894,7 @@ msgstr "Timp de conectare data socket expirat"
msgid "Unable to accept connection"
msgstr "Nu pot accepta conexiune"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
@@ -1906,39 +1921,39 @@ msgstr "Interogare"
msgid "Unable to invoke "
msgstr "Nu pot invoca"
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectare la %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nu pot crea un socket pentru %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nu pot iniţia conectarea la %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "N-am putut conecta la %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Conectare la %s"
@@ -2015,77 +2030,77 @@ msgstr "Nu pot deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "În aşteptarea antetelor"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Primit o singură linie de antet peste %u caractere"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Acest server http are zonă de suport necorespunzătoare"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Eroare internă"
@@ -2103,58 +2118,58 @@ msgstr "Nu pot face mmap la %lu bytes"
msgid "Selection %s not found"
msgstr "Selecţia %s nu s-a găsit"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tip de prescurtare nerecunoscut: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Deschidere fişier de configurare %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Linie %d prea lungă (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume"
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Eroare de sintaxă %s:%u: etichetă greşită"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Eroare de sintaxă %s:%u: incluse de aici"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului"
@@ -2222,6 +2237,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Nu pot determina starea punctului de montare %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Nu pot schimba la %s"
@@ -2469,7 +2485,7 @@ msgstr ""
"nu-i de bine, dar dacă vreţi întradevăr s-o faceţi, activaţi opţiunea APT::"
"Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Tipul de fişier index '%s' nu este suportat"
@@ -2589,7 +2605,7 @@ msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2619,7 +2635,7 @@ msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2673,23 +2689,23 @@ msgstr "Colectare furnizori fişier"
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2698,7 +2714,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2707,7 +2723,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2715,7 +2731,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
@@ -2827,52 +2843,52 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Se pregăteşte %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Se despachetează %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Se pregăteşte configurarea %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Se configurează %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Instalat %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Se pregăteşte ştergerea lui %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Se şterge %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Şters %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Se pregăteşte ştergerea completă a %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Şters complet %s"
diff --git a/po/ru.po b/po/ru.po
index 7c2d00d1f..b4d358189 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.6.46.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-01-03 23:33+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -167,7 +167,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпилирован %s %s\n"
@@ -672,7 +672,7 @@ msgstr "Не удалось переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
@@ -838,11 +838,11 @@ msgstr "Пакеты необходимо удалить, но удаление
msgid "Internal error, Ordering didn't finish"
msgstr "Внутренняя ошибка, Ordering не завершилась"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог для загрузки"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
@@ -873,7 +873,7 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
@@ -904,7 +904,7 @@ msgstr ""
"Чтобы продолжить, введите фразу: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Аварийное завершение."
@@ -912,7 +912,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось загрузить %s %s\n"
@@ -921,7 +921,7 @@ msgstr "Не удалось загрузить %s %s\n"
msgid "Some files failed to download"
msgstr "Некоторые файлы не удалось загрузить"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
@@ -1056,7 +1056,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация, возможно, поможет вам:"
@@ -1069,33 +1069,33 @@ msgstr "Внутренняя ошибка, решатель проблем вс
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "но %s будет установлен"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1103,7 +1103,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1114,7 +1114,7 @@ msgstr ""
"или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
"пакеты ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1124,121 +1124,136 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Предлагаемые пакеты:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
"тексты"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже загруженный файл '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось загрузить."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1262,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1271,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1591,9 +1606,9 @@ msgstr "Файлы заменяются содержимым пакета %s б
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s переписывает файл в пакете %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
@@ -1896,7 +1911,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
@@ -1923,39 +1938,39 @@ msgstr "Запрос"
msgid "Unable to invoke "
msgstr "Невозможно вызвать "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Соединение с %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Невозможно инициализировать соединение с %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Не удаётся соединиться с %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Соединение с %s"
@@ -2033,76 +2048,76 @@ msgstr "Не удалось открыть канал для %s"
msgid "Read error from %s process"
msgstr "Ошибка чтения из процесса %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u символов"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Неверный заголовок"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-сервер послал неверный заголовок"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2120,59 +2135,59 @@ msgstr "Невозможно отобразить в память %lu байт"
msgid "Selection %s not found"
msgstr "Не найдено: %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Неизвестная аббревиатура типа: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Открытие файла конфигурации %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Строка %d слишком длинна (максимум %d)."
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
"уровне"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
@@ -2239,6 +2254,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Невозможно прочитать атрибуты точки монтирования %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Невозможно сменить текущий каталог на %s"
@@ -2493,7 +2509,7 @@ msgstr ""
"существенно важный пакет %s. Это может привести к фатальным последствиям. "
"Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Не поддерживается индексный файл типа '%s'"
@@ -2609,7 +2625,7 @@ msgstr "Произошла ошибка во время обработки %s (U
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2639,7 +2655,7 @@ msgstr "Произошла ошибка во время обработки %s (N
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2687,21 +2703,21 @@ msgstr "Сбор информации о Provides"
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен общий ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2710,7 +2726,7 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2719,13 +2735,13 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Не совпадает размер"
@@ -2840,52 +2856,52 @@ msgstr ""
"Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими "
"файлами\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Подготавливается %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Распаковывается %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготавливается для конфигурации %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Настройка %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Установлен %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготавливается для удаления %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Удалён %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка к полному удалению %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "%s полностью удалён"
diff --git a/po/sk.po b/po/sk.po
index 01aafcbc3..b34c405da 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-10 18:50+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pre %s %s skompilovaný na %s %s\n"
@@ -653,7 +653,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -814,11 +814,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukončilo"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
@@ -849,7 +849,7 @@ msgstr "Po rozbalení sa na disku použije ďalších %sB.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -878,7 +878,7 @@ msgstr ""
"Pre pokračovanie opíšte frázu '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Prerušené."
@@ -886,7 +886,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -895,7 +895,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
@@ -1028,7 +1028,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
@@ -1041,31 +1041,31 @@ msgstr "Vnútorná chyba, problem resolver pokazil veci"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ale inštalovať sa bude %s"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1073,7 +1073,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1085,7 +1085,7 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1095,124 +1095,139 @@ msgstr ""
"balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n"
"(bug report) pre daný balík."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, problem resolver pokazil veci"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti pre zostavenie %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,31 +1236,31 @@ msgstr ""
"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1552,9 +1567,9 @@ msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Súbor %s/%s prepisuje ten z balíka %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "%s sa nedá čítať"
@@ -1853,7 +1868,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1880,39 +1895,39 @@ msgstr "Dotaz"
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Pripája sa k %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nedá sa pripojiť k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Pripája sa k %s"
@@ -1988,76 +2003,76 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri čítaní z procesu %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2075,58 +2090,58 @@ msgstr "Nedá sa urobiť mmap %lu bajtov"
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nerozpoznaná skratka typu: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Otvára sa konfiguračný súbor %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Riadok %d je príliš dlhý (nanajvýš %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaktická chyba %s:%u: Skomolená značka"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
@@ -2193,6 +2208,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Prípojný bod %s sa nedá vyhodnotiť"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Nedá sa prejsť do %s"
@@ -2439,7 +2455,7 @@ msgstr ""
"kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ súboru '%s' nie je podporovaný"
@@ -2554,7 +2570,7 @@ msgstr "Chyba pri spracovávaní %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2584,7 +2600,7 @@ msgstr "Chyba pri spracovávaní %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2634,21 +2650,21 @@ msgstr "Collecting File poskytuje"
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2657,7 +2673,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2666,13 +2682,13 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
@@ -2784,52 +2800,52 @@ msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Pripravuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaľuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravuje sa nastavenie %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Nastavuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Nainštalovaný balík %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravuje sa odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Odstraňuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Odstránený balík %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravuje sa úplné odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Balík '%s' je úplne odstránený"
diff --git a/po/sl.po b/po/sl.po
index 9c0f151b6..d6564f882 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -155,7 +155,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
@@ -653,7 +653,7 @@ msgstr "Ni mogoe preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -816,11 +816,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoe brati."
@@ -849,7 +849,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
@@ -878,7 +878,7 @@ msgstr ""
"Za nadaljevanje vnesite frazo '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Prekini."
@@ -886,7 +886,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
@@ -895,7 +895,7 @@ msgstr "Ni mogoe dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
@@ -1029,7 +1029,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
@@ -1042,31 +1042,31 @@ msgstr "Notranja napaka zaradi AllUpgrade."
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "vendar bo paket %s nameen"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1074,7 +1074,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1085,7 +1085,7 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1095,126 +1095,141 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,31 +1238,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1556,9 +1571,9 @@ msgstr "Prepii zadetek paketa brez vnosa razliice za %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoe brati %s"
@@ -1857,7 +1872,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1884,39 +1899,39 @@ msgstr "Poizvedba"
msgid "Unable to invoke "
msgstr "Ni mogoe zagnati "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Povezovanje z %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Ni mogoe ustvariti vtinice za %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni mogoe zaeti povezave z %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Ni se mogoe povezati z %s:%s (%s). Povezava potekla."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ni se mogoe povezati z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Povezujem se z %s"
@@ -1989,76 +2004,76 @@ msgstr "Ni mogoe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "akanje na glave"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Napana vrstica glave"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Strenik HTTP je poslal napano glavo odgovora"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2076,58 +2091,58 @@ msgstr "Ni mogoe narediti mmap %lu bajtov"
msgid "Selection %s not found"
msgstr "Izbira %s ni mogoe najti"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ne-prepoznan tip okrajave: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Vrstica %d je predolga (najve %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Skladenjska napaka %s:%u: Blok se zane brez imena."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Skladenjska napaka %s:%u: Nepravilna znaka."
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo."
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju."
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Skladenjska napaka %s:%u: Preve ugnezdenih vkljuitev."
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Skladenjska napaka %s:%u: Vkljuen od tu."
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke"
@@ -2194,6 +2209,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Ni mogoe doloiti priklopne toke %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Ni mogoe spremeniti v %s"
@@ -2440,7 +2456,7 @@ msgstr ""
"zanke spora/predodvisnosti. To je ponavadi slabo, toda e zares elite "
"odstranitev, vkljuite monost APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
@@ -2559,7 +2575,7 @@ msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2589,7 +2605,7 @@ msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2637,21 +2653,21 @@ msgstr "Zbiranje dobaviteljev datotek"
msgid "IO Error saving source cache"
msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2660,7 +2676,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket (zaradi manjkajoega arhiva)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2669,7 +2685,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2677,7 +2693,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
@@ -2790,52 +2806,52 @@ msgstr ""
"Zapisal %i zapisov z %i manjkajoimi datotekami in %i neujemajoimi "
"datotekami.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se z %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Nameen: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Priporoa"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Odstranitev %s ni uspela"
diff --git a/po/sv.po b/po/sv.po
index 498aa4043..1b8a0069b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-08-18 15:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -159,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s fr %s %s kompilerad den %s %s\n"
@@ -660,7 +660,7 @@ msgstr "Misslyckades med att byta namn p %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljrt uttryck - %s"
@@ -822,11 +822,11 @@ msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen frdigstlldes inte"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Kunde inte lsa hmtningskatalogen."
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
@@ -857,7 +857,7 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att anvndas.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigras p disken.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte lsa av ledigt utrymme i %s"
@@ -887,7 +887,7 @@ msgstr ""
" ?] "
# Visas d man svarar nej
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Avbryter."
@@ -895,7 +895,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortstta [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hmta %s %s\n"
@@ -904,7 +904,7 @@ msgstr "Misslyckades med att hmta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades med att hmta vissa filer"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Hmtningen frdig i \"endast-hmta\"-lge"
@@ -1039,7 +1039,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Fljande information kan vara till hjlp fr att lsa situationen:"
@@ -1052,32 +1052,32 @@ msgstr "Internt fel, problemlsaren brt snder saker"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, vljer %s fr regex \"%s\"\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "men %s kommer att installeras"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du kan mjligen rtta till detta genom att kra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1085,7 +1085,7 @@ msgstr ""
"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
"(eller ange en lsning)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1097,7 +1097,7 @@ msgstr ""
"distributionen, att ngra krvda paket nnu inte har skapats eller\n"
"lagts in frn \"Incoming\"."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1107,115 +1107,130 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta br\n"
"skrivas."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Fljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Freslagna paket:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Berknar uppgradering... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlsaren brt snder saker"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Du mste ange tminstone ett paket att hmta kllkod fr"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta ngot kllkodspaket fr %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar ver redan hmtad fil \"%s\"\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillrckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behver hmta %sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Hmtar kllkod %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hmta vissa arkiv."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan redan uppackad kllkod i %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Kontrollera att paketet \"dpkg-dev\" r installerat.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hmta byggberoendeinformation fr %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1223,7 +1238,7 @@ msgid ""
msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1232,32 +1247,32 @@ msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
"versioner av paketet %s uppfyller versionskraven"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att uppfylla %s-beroendet fr %s: Det installerade paketet %"
"s r fr nytt"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att uppfylla %s-beroendet fr %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden fr %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Moduler som stds:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1572,9 +1587,9 @@ msgstr "Skriver ver pakettrff utan version fr %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Filen %s/%s skriver ver den i paketet %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte lsa %s"
@@ -1874,7 +1889,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgrns"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutning"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lgga filen till hashtabellen"
@@ -1903,40 +1918,40 @@ msgid "Unable to invoke "
msgstr "Kunde inte starta "
# Felmeddelande fr misslyckad chdir
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
# [f]amilj, [t]yp, [p]rotokoll
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kunde inte skapa uttag (socket) fr %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kunde inte pbrja anslutning till %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunde inte ansluta till %s:%s (%s), tog fr lng tid"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunde inte ansluta till %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Ansluter till %s"
@@ -2014,76 +2029,76 @@ msgstr "Kunde inte ppna rr fr %s"
msgid "Read error from %s process"
msgstr "Lsfel p %s-processen"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Vntar p huvuden"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam huvudrad p %u tecken"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern snde ett ogiltigt svarshuvud"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern snde ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern snde ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers std fr delvis hmtning fungerar inte"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Oknt datumformat"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsgrnsen fr anslutningen nddes"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fel vid lsning frn server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Internt fel"
@@ -2101,57 +2116,57 @@ msgstr "Kunde inte utfra mmap p %lu byte"
msgid "Selection %s not found"
msgstr "Valet %s ej funnet"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Oknd typfrkortning: \"%c\""
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "ppnar konfigurationsfil %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Rad %d fr lng (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfel %s:%u: Block brjar utan namn."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfel %s:%u: Felformat mrke"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfel %s:%u: verfldigt skrp efter vrde"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntaxfel %s:%u: Direktiv kan endast utfras p toppnivn"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfel %s:%u: Fr mnga nstlade inkluderingar"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfel %s:%u: Inkluderad hrifrn"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stds ej"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfel %s:%u: verfldigt skrp vid filens slut"
@@ -2219,6 +2234,7 @@ msgstr "Kunde inte ta status p monteringspunkt %s."
# Felmeddelande fr misslyckad chdir
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Kunde inte g till %s"
@@ -2469,7 +2485,7 @@ msgstr ""
"Detta r oftast en dlig id, men om du verkligen vill gra det kan du "
"aktivera flaggan \"APT::Force-LoopBreak\"."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Indexfiler av typ \"%s\" stds inte"
@@ -2588,7 +2604,7 @@ msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2618,7 +2634,7 @@ msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2667,21 +2683,21 @@ msgstr "Samlar filberoenden"
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av kllcache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen publik nyckel tillgnglig fr fljande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2690,7 +2706,7 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket (p grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2699,13 +2715,13 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
@@ -2816,52 +2832,52 @@ msgstr "Skrev %i poster med %i filer som inte stmmer\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stmmer\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Frbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Packar upp %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Frbereder konfigurering av %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Konfigurerar %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Installerade %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Frbereder fr borttagning av %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Tog bort %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Frbereder att ta bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
diff --git a/po/tl.po b/po/tl.po
index 5980e81b6..909957450 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -162,7 +162,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
@@ -665,7 +665,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -830,11 +830,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -866,7 +866,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -895,7 +895,7 @@ msgstr ""
"Upang magpatuloy, ibigay ang pariralang '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Abort."
@@ -903,7 +903,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -912,7 +912,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -1047,7 +1047,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
@@ -1061,32 +1061,32 @@ msgstr "Error na internal, may nasira ang problem resolver"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1094,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,7 +1105,7 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1115,115 +1115,130 @@ msgstr ""
"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1232,7 +1247,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1241,32 +1256,32 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1576,9 +1591,9 @@ msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
@@ -1878,7 +1893,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1905,39 +1920,39 @@ msgstr "Tanong"
msgid "Unable to invoke "
msgstr "Hindi ma-invoke "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Hindi maka-konekta sa %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Kumokonekta sa %s"
@@ -2016,76 +2031,76 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
msgid "Read error from %s process"
msgstr "Error sa pagbasa mula sa prosesong %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Naghihintay ng panimula"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Maling linyang panimula"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Internal na error"
@@ -2103,58 +2118,58 @@ msgstr "Hindi makagawa ng mmap ng %lu na byte"
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Hindi kilalang katagang uri: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Binubuksan ang talaksang pagsasaayos %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Labis ang haba ng linyang %d (max %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntax error %s:%u: Maling anyo ng Tag"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntax error %s:%u: May basura matapos ng halaga"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntax error %s:%u: Sinama mula dito"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
@@ -2223,6 +2238,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Di mai-stat ang mount point %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Di makalipat sa %s"
@@ -2473,7 +2489,7 @@ msgstr ""
"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
"activate ang APT::Force-LoopBreak na option."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
@@ -2595,7 +2611,7 @@ msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2625,7 +2641,7 @@ msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2675,21 +2691,21 @@ msgstr "Kinukuha ang Talaksang Provides"
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
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:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2698,7 +2714,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2707,7 +2723,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2715,7 +2731,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2830,52 +2846,52 @@ msgstr ""
"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
"mismatch\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Hinahanda ang %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Binubuklat ang %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Hinahanda ang %s upang isaayos"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Isasaayos ang %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Naghahanda para sa pagtanggal ng %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Tinatanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Tinanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
diff --git a/po/uk.po b/po/uk.po
deleted file mode 100644
index b39053583..000000000
--- a/po/uk.po
+++ /dev/null
@@ -1,2897 +0,0 @@
-# translation of apt-all.po to Українська
-# This file is put in the public domain.
-#
-# Artem Bondarenko <artem.brz@gmail.com>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: apt-all\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
-"PO-Revision-Date: 2006-07-29 15:57+0300\n"
-"Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
-"Language-Team: Українська <uk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.1\n"
-
-#: cmdline/apt-cache.cc:143
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
-
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Не можу знайти пакунок %s"
-
-#: cmdline/apt-cache.cc:247
-msgid "Total package names : "
-msgstr "Всього імен пакунків : "
-
-#: cmdline/apt-cache.cc:287
-msgid " Normal packages: "
-msgstr " Нормальних пакунків: "
-
-#: cmdline/apt-cache.cc:288
-msgid " Pure virtual packages: "
-msgstr " Чисто віртуальних пакунків: "
-
-#: cmdline/apt-cache.cc:289
-msgid " Single virtual packages: "
-msgstr " Окремих віртуальних пакунків: "
-
-#: cmdline/apt-cache.cc:290
-msgid " Mixed virtual packages: "
-msgstr " Змішаних віртуальних пакунків: "
-
-#: cmdline/apt-cache.cc:291
-msgid " Missing: "
-msgstr " Пропущено: "
-
-#: cmdline/apt-cache.cc:293
-msgid "Total distinct versions: "
-msgstr "Всього унікальних версій: "
-
-#: cmdline/apt-cache.cc:295
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Всього унікальних версій: "
-
-#: cmdline/apt-cache.cc:297
-msgid "Total dependencies: "
-msgstr "Всього залежностей: "
-
-#: cmdline/apt-cache.cc:300
-msgid "Total ver/file relations: "
-msgstr "Всього відносин Версія/Файл: "
-
-#: cmdline/apt-cache.cc:302
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Всього відносин Версія/Файл: "
-
-#: cmdline/apt-cache.cc:304
-msgid "Total Provides mappings: "
-msgstr "Всього відносин Provides: "
-
-#: cmdline/apt-cache.cc:316
-msgid "Total globbed strings: "
-msgstr "Всього розгорнутих рядків: "
-
-#: cmdline/apt-cache.cc:330
-msgid "Total dependency version space: "
-msgstr "Всього інформації про залежності: "
-
-#: cmdline/apt-cache.cc:335
-msgid "Total slack space: "
-msgstr "Порожнього місця в кеші: "
-
-#: cmdline/apt-cache.cc:343
-msgid "Total space accounted for: "
-msgstr "Загальний простір полічений для: "
-
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
-#, c-format
-msgid "Package file %s is out of sync."
-msgstr "Перелік пакунків %s розсинхронізований."
-
-#: cmdline/apt-cache.cc:1293
-msgid "You must give exactly one pattern"
-msgstr "Ви повинні задати рівно один шаблон"
-
-#: cmdline/apt-cache.cc:1447
-msgid "No packages found"
-msgstr "Не знайдено жодного пакунка"
-
-#: cmdline/apt-cache.cc:1524
-msgid "Package files:"
-msgstr "Переліки пакунків:"
-
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків"
-
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
-msgid "Pinned packages:"
-msgstr "Зафіксовані пакунки:"
-
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
-msgid "(not found)"
-msgstr "(не знайдено)"
-
-#. Installed version
-#: cmdline/apt-cache.cc:1577
-msgid " Installed: "
-msgstr " Встановлено: "
-
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
-msgid "(none)"
-msgstr "(відсутній)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1584
-msgid " Candidate: "
-msgstr " Кандидат: "
-
-#: cmdline/apt-cache.cc:1594
-msgid " Package pin: "
-msgstr " Фіксатор(pin) пакунка: "
-
-#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
-msgid " Version table:"
-msgstr " Таблиця версій:"
-
-#: cmdline/apt-cache.cc:1618
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s для %s %s скомпільовано %s %s\n"
-
-#: cmdline/apt-cache.cc:1721
-msgid ""
-"Usage: apt-cache [options] command\n"
-" apt-cache [options] add file1 [file2 ...]\n"
-" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
-"\n"
-"Commands:\n"
-" add - Add a package file to the source cache\n"
-" gencaches - Build both the package and source cache\n"
-" showpkg - Show some general information for a single package\n"
-" showsrc - Show source records\n"
-" stats - Show some basic statistics\n"
-" dump - Show the entire file in a terse form\n"
-" dumpavail - Print an available file to stdout\n"
-" unmet - Show unmet dependencies\n"
-" search - Search the package list for a regex pattern\n"
-" show - Show a readable record for the package\n"
-" depends - Show raw dependency information for a package\n"
-" rdepends - Show reverse dependency information for a package\n"
-" pkgnames - List the names of all packages\n"
-" dotty - Generate package graphs for GraphVis\n"
-" xvcg - Generate package graphs for xvcg\n"
-" policy - Show policy settings\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -p=? The package cache.\n"
-" -s=? The source cache.\n"
-" -q Disable progress indicator.\n"
-" -i Show only important deps for the unmet command.\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-msgstr ""
-"Використання: apt-cache [options] command\n"
-" або: apt-cache [options] add file1 [file1 ...]\n"
-" або: apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-" або: apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache - низькорівневий інструмент, що використається для керування\n"
-"двійковими кеш-файлами APT'а, а також для добування інформації з них\n"
-"Команди:\n"
-" add - додати файл пакунка в кеш джерел\n"
-" gencaches - побудувати обидва кеша пакунків - бінарних і з вихідними "
-"текстами\n"
-" showpkg - загальна інформація про конкретний пакунок\n"
-" stats - основна статистика\n"
-" dump - показати весь файл у стислій формі\n"
-" dumpavail - видати на stdout список доступних пакунків\n"
-" unmet - показати незадоволені залежності\n"
-" search - знайти пакунки, назва яких задовольняє регулярний вираз\n"
-" show - показати інформацію про пакунок в зрозумілій формі\n"
-" depends - показати інформацію про залежності пакунка построково\n"
-" rdepends - показати інформацію про зворотні залежності пакунка\n"
-" pkgnames - показати імена всіх пакунків\n"
-" dotty - генерувати граф залежностей пакунків у форматі GraphVis\n"
-" xvcg - генерувати граф залежностей пакунків у форматі xvcg\n"
-" policy - показати поточну політику вибору пакунків\n"
-"\n"
-"Опції:\n"
-" -h Цей текст.\n"
-" -p=? Кеш пакунків.\n"
-" -s=? Кеш джерел.\n"
-" -q Не показувати індикатор прогресу.\n"
-" -i Показувати тільки важливі залежності для команди unmet.\n"
-" -c=? Читати зазначений файл конфігурації.\n"
-" -o=? Встановити довільну опцію конфігурації, наприклад, -o dir::cache=/"
-"tmp\n"
-"Подробиці в сторінках керівництва apt-cache(8) і apt.conf(5).\n"
-
-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Задайте назву для цього диска, наприклад 'Debian 2.1r1 Disk 1'"
-
-#: cmdline/apt-cdrom.cc:93
-msgid "Please insert a Disc in the drive and press enter"
-msgstr "Вставте диск у пристрій і натисніть Ввід"
-
-#: cmdline/apt-cdrom.cc:117
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Повторіть цей процес для інших наявних CD."
-
-#: cmdline/apt-config.cc:41
-msgid "Arguments not in pairs"
-msgstr "Непарні аргументи"
-
-#: cmdline/apt-config.cc:76
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-" shell - Shell mode\n"
-" dump - Show the configuration\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-config [options] command\n"
-"\n"
-"apt-config - простий інструмент для читання конфігураційного файлу APT\n"
-"\n"
-"Команди:\n"
-" shell - режим shell\n"
-" dump - показати конфігурацію\n"
-"\n"
-"Опції:\n"
-" -h Цей текст.\n"
-" -с=? Читати зазначений конфігураційний файл.\n"
-" -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s не є правильним DEB-пакунком."
-
-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -t Set the temp dir\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
-"і файли-шаблони\n"
-"\n"
-"Опції:\n"
-" -h Цей текст\n"
-" -t Встановити теку для тимчасових файлів\n"
-" -c=? Читати зазначений конфігураційний файл\n"
-" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Неможливо записати в %s"
-
-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Неможливо визначити версію debconf. Він встановлений?"
-
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
-msgid "Package extension list is too long"
-msgstr "Список розширень, припустимих для пакунків, занадто довгий"
-
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Помилка обробки течи %s"
-
-#: ftparchive/apt-ftparchive.cc:251
-msgid "Source extension list is too long"
-msgstr ""
-"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
-"довгий"
-
-#: ftparchive/apt-ftparchive.cc:368
-msgid "Error writing header to contents file"
-msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
-
-#: ftparchive/apt-ftparchive.cc:398
-#, c-format
-msgid "Error processing contents %s"
-msgstr "помилка обробки повного переліку вмісту пакунків (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:553
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" --md5 Control MD5 generation\n"
-" -s=? Source override file\n"
-" -q Quiet\n"
-" -d=? Select the optional caching database\n"
-" --no-delink Enable delinking debug mode\n"
-" --contents Control contents file generation\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
-msgstr ""
-"Використання: apt-ftparchive [параметри] команда\n"
-"Команди: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n"
-"безліч стилів генерації: від повністю автоматичного до функціональної "
-"заміни\n"
-"програм dpkg-scanpackages і dpkg-scansources\n"
-"\n"
-"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n"
-"тек, що містять файли .deb. Файл Package містить у собі керуючі\n"
-"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n"
-"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n"
-"допомогою файлу override.\n"
-"\n"
-"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n"
-"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n"
-"режимі можна використати параметр --source-override.\n"
-"\n"
-"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій "
-"теці\n"
-"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n"
-"з якого починається рекурсивний обхід, а файл перепризначень (override)\n"
-"повинен містити запис про перепризначення керуючих полів. Якщо був "
-"зазначений\n"
-"Pathprefix, то його значення додається до керуючих полів, що містять\n"
-"імена файлів. Приклад використання для архіву Debian:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Параметри:\n"
-" -h Цей текст\n"
-" --md5 Керування генерацією MD5-хешів\n"
-" -s=? Вказати файл перепризначень (override) для пакунків з вихідними "
-"текстами\n"
-" -q Не виводити повідомлення в процесі роботи\n"
-" -d=? Вказати кешуючу базу даних (не обов'язково)\n"
-" --no-delink Включити режим налагодження процесу видалення файлів\n"
-" --contents Керування генерацією повного переліку вмісту пакунків\n"
-" (файлу Contents)\n"
-" -c=? Використати зазначений конфігураційний файл\n"
-" -o=? Вказати довільний параметр конфігурації"
-
-#: ftparchive/apt-ftparchive.cc:759
-msgid "No selections matched"
-msgstr "Збігів не виявлено"
-
-#: ftparchive/apt-ftparchive.cc:832
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "У групі пакунків '%s' відсутні деякі файли"
-
-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД була пошкоджена, файл перейменований в %s.old"
-
-#: ftparchive/cachedb.cc:61
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB застаріла, намагаюсь оновити %s"
-
-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-"
-"ласка видаліть і наново створіть базу."
-
-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Не вдалося відкрити DB файл %s: %s"
-
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Не вдалося одержати атрибути %s"
-
-#: ftparchive/cachedb.cc:238
-msgid "Archive has no control record"
-msgstr "В архіві немає поля control"
-
-#: ftparchive/cachedb.cc:444
-msgid "Unable to get a cursor"
-msgstr "Неможливо одержати курсор"
-
-#: ftparchive/writer.cc:75
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Не вдалося прочитати теку %s\n"
-
-#: ftparchive/writer.cc:80
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Неможливо прочитати атрибути %s\n"
-
-#: ftparchive/writer.cc:131
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:133
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:140
-msgid "E: Errors apply to file "
-msgstr "E: Помилки відносяться до файлу"
-
-#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Не вдалося піти по посиланню %s"
-
-#: ftparchive/writer.cc:169
-msgid "Tree walking failed"
-msgstr "Не вдалося зробити обхід дерева"
-
-#: ftparchive/writer.cc:194
-#, c-format
-msgid "Failed to open %s"
-msgstr "Не вдалося відкрити %s"
-
-#: ftparchive/writer.cc:253
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
-
-#: ftparchive/writer.cc:261
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Не вдалося прочитати посилання %s"
-
-#: ftparchive/writer.cc:265
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Не вдалося видалити %s"
-
-#: ftparchive/writer.cc:272
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Не вдалося створити посилання %s на %s"
-
-#: ftparchive/writer.cc:282
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "Перевищено ліміт в %s в DeLink.\n"
-
-#: ftparchive/writer.cc:386
-msgid "Archive had no package field"
-msgstr "В архіві немає поля package"
-
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
-#, c-format
-msgid " %s has no override entry\n"
-msgstr " Відсутній запис про перепризначення для %s\n"
-
-#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
-#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr " пакунок %s супроводжує %s, а не %s\n"
-
-#: ftparchive/writer.cc:619
-#, c-format
-msgid " %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:623
-#, c-format
-msgid " %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:317
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Внутрішня помилка, не можу знайти складову частину %s"
-
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - не вдалося виділити пам'ять"
-
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "Не вдалося відкрити %s"
-
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1"
-
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2"
-
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3"
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Не вдалося прочитати файл перепризначень (override)%s"
-
-#: ftparchive/multicompress.cc:71
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Невідомий алгоритм стиснення '%s'"
-
-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути пакування"
-
-#: ftparchive/multicompress.cc:168 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Не вдалося створити IPC-канал для породженого процесу"
-
-#: ftparchive/multicompress.cc:194
-msgid "Failed to create FILE*"
-msgstr "Не вдалося створити FILE*"
-
-#: ftparchive/multicompress.cc:197
-msgid "Failed to fork"
-msgstr "Не вдалося виконати породжений процес"
-
-#: ftparchive/multicompress.cc:211
-msgid "Compress child"
-msgstr "Процес-нащадок, що виконує пакування"
-
-#: ftparchive/multicompress.cc:234
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутрішня помилка, не вдалося створити %s"
-
-#: ftparchive/multicompress.cc:285
-msgid "Failed to create subprocess IPC"
-msgstr "Не вдалося створити IPC з породженим процесом"
-
-#: ftparchive/multicompress.cc:320
-msgid "Failed to exec compressor "
-msgstr "Не вдалося виконати компресор "
-
-#: ftparchive/multicompress.cc:359
-msgid "decompressor"
-msgstr "декомпресор"
-
-#: ftparchive/multicompress.cc:402
-msgid "IO to subprocess/file failed"
-msgstr "Помилка уведення/виводу в підпроцес/файл"
-
-#: ftparchive/multicompress.cc:454
-msgid "Failed to read while computing MD5"
-msgstr "Помилка читання під час обчислення MD5"
-
-#: ftparchive/multicompress.cc:471
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Не вдалося видалити %s"
-
-#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Не вдалося перейменувати %s в %s"
-
-#: cmdline/apt-get.cc:121
-msgid "Y"
-msgstr "Т"
-
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Помилка компіляції регулярного виразу - %s"
-
-#: cmdline/apt-get.cc:238
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежності:"
-
-#: cmdline/apt-get.cc:328
-#, c-format
-msgid "but %s is installed"
-msgstr "але %s вже встановлений"
-
-#: cmdline/apt-get.cc:330
-#, c-format
-msgid "but %s is to be installed"
-msgstr "але %s буде встановлений"
-
-#: cmdline/apt-get.cc:337
-msgid "but it is not installable"
-msgstr "але він не може бути встановлений"
-
-#: cmdline/apt-get.cc:339
-msgid "but it is a virtual package"
-msgstr "але це віртуальний пакунок"
-
-#: cmdline/apt-get.cc:342
-msgid "but it is not installed"
-msgstr "але він не встановлений"
-
-#: cmdline/apt-get.cc:342
-msgid "but it is not going to be installed"
-msgstr "але він не буде встановлений"
-
-#: cmdline/apt-get.cc:347
-msgid " or"
-msgstr " чи"
-
-#: cmdline/apt-get.cc:376
-msgid "The following NEW packages will be installed:"
-msgstr "НОВІ пакунки, які будуть встановлені:"
-
-#: cmdline/apt-get.cc:402
-msgid "The following packages will be REMOVED:"
-msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-
-#: cmdline/apt-get.cc:424
-msgid "The following packages have been kept back:"
-msgstr "Пакунки, які будуть залишені в незмінному вигляді:"
-
-#: cmdline/apt-get.cc:445
-msgid "The following packages will be upgraded:"
-msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-
-#: cmdline/apt-get.cc:466
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакунки, будуть замінені на більш СТАРІ версії:"
-
-#: cmdline/apt-get.cc:486
-msgid "The following held packages will be changed:"
-msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:"
-
-#: cmdline/apt-get.cc:539
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (внаслідок %s) "
-
-#: cmdline/apt-get.cc:547
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"УВАГА: Ці істотно важливі пакунки будуть вилучені.\n"
-"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-
-#: cmdline/apt-get.cc:578
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "оновлено %lu, встановлено %lu нових пакунків, "
-
-#: cmdline/apt-get.cc:582
-#, c-format
-msgid "%lu reinstalled, "
-msgstr " %lu перевстановлено, "
-
-#: cmdline/apt-get.cc:584
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu пакунків замінено на старі версії, "
-
-#: cmdline/apt-get.cc:586
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n"
-
-#: cmdline/apt-get.cc:590
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не встановлено до кінця чи видалено %lu пакунків.\n"
-
-#: cmdline/apt-get.cc:664
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: cmdline/apt-get.cc:667
-msgid " failed."
-msgstr " невдача."
-
-#: cmdline/apt-get.cc:670
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: cmdline/apt-get.cc:673
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: cmdline/apt-get.cc:675
-msgid " Done"
-msgstr " Виконано"
-
-#: cmdline/apt-get.cc:679
-msgid "You might want to run `apt-get -f install' to correct these."
-msgstr ""
-"Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f "
-"install'."
-
-#: cmdline/apt-get.cc:682
-msgid "Unmet dependencies. Try using -f."
-msgstr "Незадоволені залежності. Спробуйте використати -f."
-
-#: cmdline/apt-get.cc:704
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
-
-#: cmdline/apt-get.cc:708
-msgid "Authentication warning overridden.\n"
-msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
-
-#: cmdline/apt-get.cc:715
-msgid "Install these packages without verification [y/N]? "
-msgstr "Встановити ці пакунки без перевірки [т/Н]? "
-
-#: cmdline/apt-get.cc:717
-msgid "Some packages could not be authenticated"
-msgstr "Деякі пакунки неможливо автентифікувати"
-
-#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Існують проблеми, а опція -y використана без --force-yes"
-
-#: cmdline/apt-get.cc:770
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"Внутрішня помилка, InstallPackages була викликана з непрацездатними "
-"пакунками!"
-
-#: cmdline/apt-get.cc:779
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Пакунки необхідно видалити, але видалення заборонене."
-
-#: cmdline/apt-get.cc:790
-msgid "Internal error, Ordering didn't finish"
-msgstr "Внутрішня помилка, Ordering не завершилася"
-
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
-msgid "Unable to lock the download directory"
-msgstr "Неможливо заблокувати теку для завантаження"
-
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
-#: apt-pkg/cachefile.cc:63
-msgid "The list of sources could not be read."
-msgstr "Неможливо прочитати перелік джерел."
-
-#: cmdline/apt-get.cc:831
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org"
-
-#: cmdline/apt-get.cc:836
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Необхідно завантажити %sB/%sB архівів.\n"
-
-#: cmdline/apt-get.cc:839
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Необхідно завантажити %sB архівів.\n"
-
-#: cmdline/apt-get.cc:844
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Після розпакування об'єм зайнятого дискового простору зросте на %sB.\n"
-
-#: cmdline/apt-get.cc:847
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
-msgstr ""
-"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
-
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Не вдалося визначити кількість вільного місця в %s"
-
-#: cmdline/apt-get.cc:864
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Недостатньо вільного місця в %s."
-
-#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"Запитане виконання тільки тривіальних операцій, але це не тривіальна "
-"операція."
-
-#: cmdline/apt-get.cc:881
-msgid "Yes, do as I say!"
-msgstr "Так, робити, як я скажу!"
-
-#: cmdline/apt-get.cc:883
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Те, що ви хочете зробити, може мати небажані наслідки.\n"
-"Щоб продовжити, введіть фразу: '%s'\n"
-" ?] "
-
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
-msgid "Abort."
-msgstr "Перервано."
-
-#: cmdline/apt-get.cc:904
-msgid "Do you want to continue [Y/n]? "
-msgstr "Бажаєте продовжити [Т/н]? "
-
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
-#, c-format
-msgid "Failed to fetch %s %s\n"
-msgstr "Не вдалося завантажити %s %s\n"
-
-#: cmdline/apt-get.cc:994
-msgid "Some files failed to download"
-msgstr "Деякі файли не вдалося завантажити"
-
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
-msgid "Download complete and in download only mode"
-msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
-
-#: cmdline/apt-get.cc:1001
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
-"або спробувати повторити запуск з ключем --fix-missing?"
-
-#: cmdline/apt-get.cc:1005
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing і зміна носія в даний момент не підтримується"
-
-#: cmdline/apt-get.cc:1010
-msgid "Unable to correct missing packages."
-msgstr "Неможливо виправити втрачені пакунки."
-
-#: cmdline/apt-get.cc:1011
-msgid "Aborting install."
-msgstr "Переривається встановлення."
-
-#: cmdline/apt-get.cc:1045
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Помітьте, замість %2$s вибирається %1$s\n"
-
-#: cmdline/apt-get.cc:1055
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Пропускається %s - пакунок вже встановлений, і опція upgrade не "
-"встановлена.\n"
-
-#: cmdline/apt-get.cc:1073
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Пакунок %s не встановлений, тому не може бути видалений\n"
-
-#: cmdline/apt-get.cc:1084
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n"
-
-#: cmdline/apt-get.cc:1096
-msgid " [Installed]"
-msgstr " [Встановлено]"
-
-#: cmdline/apt-get.cc:1101
-msgid "You should explicitly select one to install."
-msgstr "Ви повинні явно вказати, який саме ви хочете встановити."
-
-#: cmdline/apt-get.cc:1106
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Пакунок %s недоступний, але згадується у переліку залежностей іншого "
-"пакунка.\n"
-"Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не "
-"згаданих в sources.list\n"
-
-#: cmdline/apt-get.cc:1125
-msgid "However the following packages replace it:"
-msgstr "Однак наступні пакунки можуть його замінити:"
-
-#: cmdline/apt-get.cc:1128
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Для пакунка %s не знайдені кандидати на встановлення"
-
-#: cmdline/apt-get.cc:1148
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
-
-#: cmdline/apt-get.cc:1156
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Вже встановлена найновіша версія %s.\n"
-
-#: cmdline/apt-get.cc:1185
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Реліз '%s' для '%s' не знайдений"
-
-#: cmdline/apt-get.cc:1187
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Версія '%s' для '%s' не знайдена"
-
-#: cmdline/apt-get.cc:1193
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Обрана версія %s (%s) для %s\n"
-
-#: cmdline/apt-get.cc:1330
-msgid "The update command takes no arguments"
-msgstr "Команді update не потрібні аргументи"
-
-#: cmdline/apt-get.cc:1343
-msgid "Unable to lock the list directory"
-msgstr "Неможливо заблокувати теку з переліками пакунків"
-
-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Деякі індексні файли не завантажилися, вони були зігноровані або замість них "
-"були використані старі версії."
-
-#: cmdline/apt-get.cc:1433
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: cmdline/apt-get.cc:1465
-#, fuzzy
-msgid ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr "НОВІ пакунки, які будуть встановлені:"
-
-#: cmdline/apt-get.cc:1467
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1472
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
-msgid "The following information may help to resolve the situation:"
-msgstr "Наступна інформація можливо допоможе Вам:"
-
-#: cmdline/apt-get.cc:1479
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-
-#: cmdline/apt-get.cc:1498
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Внутрішня помилка, AllUpgrade все поламав"
-
-#: cmdline/apt-get.cc:1543
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Не можу знайти пакунок %s"
-
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Не можу знайти пакунок %s"
-
-#: cmdline/apt-get.cc:1681
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
-
-#: cmdline/apt-get.cc:1711
-#, fuzzy, c-format
-msgid "%s set to manual installed.\n"
-msgstr "але %s буде встановлений"
-
-#: cmdline/apt-get.cc:1724
-msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
-"install':"
-
-#: cmdline/apt-get.cc:1727
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
-"вказуючи імені пакунка (або знайдіть інше рішення)."
-
-#: cmdline/apt-get.cc:1739
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Деякі пакунки неможливо встановити. Можливо, Ви просите неможливого,\n"
-"або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
-"ще не створені або були вилучені з Incoming."
-
-#: cmdline/apt-get.cc:1747
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-"Так як Ви просили виконати тільки одну операцію, те найімовірніше, що\n"
-"пакунок просто не може бути встановлений через помилки в самому пакунку.\n"
-"Необхідно відіслати звіт про цю помилку."
-
-#: cmdline/apt-get.cc:1755
-msgid "Broken packages"
-msgstr "Зламані пакунки"
-
-#: cmdline/apt-get.cc:1784
-msgid "The following extra packages will be installed:"
-msgstr "Будуть встановлені наступні додаткові пакунки:"
-
-#: cmdline/apt-get.cc:1873
-msgid "Suggested packages:"
-msgstr "Пропоновані пакунки:"
-
-#: cmdline/apt-get.cc:1874
-msgid "Recommended packages:"
-msgstr "Рекомендовані пакунки:"
-
-#: cmdline/apt-get.cc:1902
-msgid "Calculating upgrade... "
-msgstr "Обчислення оновлень... "
-
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
-msgid "Failed"
-msgstr "Невдача"
-
-#: cmdline/apt-get.cc:1910
-msgid "Done"
-msgstr "Виконано"
-
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
-msgid "Internal error, problem resolver broke stuff"
-msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-
-#: cmdline/apt-get.cc:2085
-msgid "Must specify at least one package to fetch source for"
-msgstr ""
-"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
-"тексти"
-
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-
-#: cmdline/apt-get.cc:2164
-#, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Пропускаємо вже завантажений файл '%s'\n"
-
-#: cmdline/apt-get.cc:2188
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Недостатньо місця в %s"
-
-#: cmdline/apt-get.cc:2193
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
-
-#: cmdline/apt-get.cc:2196
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-
-#: cmdline/apt-get.cc:2202
-#, c-format
-msgid "Fetch source %s\n"
-msgstr "Завантаження вихідних текстів %s\n"
-
-#: cmdline/apt-get.cc:2233
-msgid "Failed to fetch some archives."
-msgstr "Деякі архіви не вдалося завантажити."
-
-#: cmdline/apt-get.cc:2261
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
-"розпаковані вихідні тексти\n"
-
-#: cmdline/apt-get.cc:2273
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Команда розпакування '%s' завершилася невдало.\n"
-
-#: cmdline/apt-get.cc:2274
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-
-#: cmdline/apt-get.cc:2291
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Команда побудови '%s' закінчилася невдало.\n"
-
-#: cmdline/apt-get.cc:2310
-msgid "Child process failed"
-msgstr "Породжений процес завершився невдало"
-
-#: cmdline/apt-get.cc:2326
-msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
-"пакунок"
-
-#: cmdline/apt-get.cc:2354
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-
-#: cmdline/apt-get.cc:2374
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "%s не має залежностей для побудови.\n"
-
-#: cmdline/apt-get.cc:2426
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-
-#: cmdline/apt-get.cc:2478
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-msgstr ""
-"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
-"пакунка %s не задовольняє умови"
-
-#: cmdline/apt-get.cc:2513
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
-"пакунок %s новіше, аніж треба"
-
-#: cmdline/apt-get.cc:2538
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-
-#: cmdline/apt-get.cc:2552
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Залежності для побудови %s не можуть бути задоволені."
-
-#: cmdline/apt-get.cc:2556
-msgid "Failed to process build dependencies"
-msgstr "Обробка залежностей для побудови закінчилася невдало"
-
-#: cmdline/apt-get.cc:2588
-msgid "Supported modules:"
-msgstr "Підтримувані модулі:"
-
-#: cmdline/apt-get.cc:2629
-#, fuzzy
-msgid ""
-"Usage: apt-get [options] command\n"
-" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-" apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-" update - Retrieve new lists of packages\n"
-" upgrade - Perform an upgrade\n"
-" install - Install new packages (pkg is libc6 not libc6.deb)\n"
-" remove - Remove packages\n"
-" purge - Remove and purge packages\n"
-" source - Download source archives\n"
-" build-dep - Configure build-dependencies for source packages\n"
-" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-" dselect-upgrade - Follow dselect selections\n"
-" clean - Erase downloaded archive files\n"
-" autoclean - Erase old downloaded archive files\n"
-" check - Verify that there are no broken dependencies\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -q Loggable output - no progress indicator\n"
-" -qq No output except for errors\n"
-" -d Download only - do NOT install or unpack archives\n"
-" -s No-act. Perform ordering simulation\n"
-" -y Assume Yes to all queries and do not prompt\n"
-" -f Attempt to continue if the integrity check fails\n"
-" -m Attempt to continue if archives are unlocatable\n"
-" -u Show a list of upgraded packages as well\n"
-" -b Build the source package after fetching it\n"
-" -V Show verbose version numbers\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-" This APT has Super Cow Powers.\n"
-msgstr ""
-"Використання: apt-get [options] command\n"
-" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-" apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get - простий інтерфейс командного рядка для завантаження й\n"
-"встановлення пакунків. Найбільш часто використовувані команди - update \n"
-"і install.\n"
-"\n"
-"Команди:\n"
-" update - завантажити нові переліки пакунків\n"
-" upgrade - виконати оновлення пакунків\n"
-" install - встановити нові пакунки (назва пакунка вказується\n"
-" як libc6, а не libc6.deb)\n"
-" remove - видалити пакунок\n"
-" source - завантажити архіви з вихідними текстами\n"
-" build-dep - завантажити все необхідне для побудови зазначеного\n"
-" пакунку з вихідних текстів\n"
-" dist-upgrade - оновити всю систему, докладніше - в apt-get(8)\n"
-" dselect-upgrade - керуватися вибором, зробленим в dselect'і\n"
-" clean - видалити завантажені архіви\n"
-" autoclean - видалити старі завантажені архіви\n"
-" check - перевірити наявність порушених залежностей\n"
-"\n"
-"Опції:\n"
-" -h Цей текст.\n"
-" -q Виводити повідомлення, придатні для запису у файл журналу.\n"
-" Не виводити індикатор прогресу\n"
-" -qq Виводити тільки повідомлення про помилки\n"
-" -d Тільки завантажити - не встановлювати й не розпаковувати архіви\n"
-" -s Не виконувати дії насправді. Імітація роботи\n"
-" -y Відповідати \"Так\" на всі питання. Самі питання при цьому не "
-"виводяться\n"
-" -f Продовжувати, навіть якщо перевірка цілісності не пройшла\n"
-" -m Продовжувати, навіть якщо місце розташування архівів невідомо\n"
-" -u Показувати список оновлюваних пакунків\n"
-" -b Компілювати пакунок з вихідних текстів після їхнього завантаження\n"
-" -V Показувати версії пакунків\n"
-" -c=? Читати зазначений файл конфігурації\n"
-" -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
-"Сторінки керівництва apt-get(8), sources.list(5) і apt.conf(5)\n"
-"містять більше інформації.\n"
-" This APT has Super Cow Powers.\n"
-
-#: cmdline/acqprogress.cc:55
-msgid "Hit "
-msgstr "В кеші "
-
-#: cmdline/acqprogress.cc:79
-msgid "Get:"
-msgstr "Отр:"
-
-#: cmdline/acqprogress.cc:110
-msgid "Ign "
-msgstr "Ігн "
-
-#: cmdline/acqprogress.cc:114
-msgid "Err "
-msgstr "Пом "
-
-#: cmdline/acqprogress.cc:135
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Отримано %sB за %sB (%sB/s)\n"
-
-#: cmdline/acqprogress.cc:225
-#, c-format
-msgid " [Working]"
-msgstr " [Йде робота]"
-
-#: cmdline/acqprogress.cc:271
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Зміна носія: вставте диск з міткою '%s' у пристрій '%s' і натисніть Ввід\n"
-
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr "Запис про невідомий пакунок!"
-
-#: cmdline/apt-sortpkgs.cc:150
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -s Use source file sorting\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -"
-"s\n"
-"використається, щоб вказати тип списку.\n"
-"\n"
-"Опції:\n"
-" -h цей текст\n"
-" -s сортувати список файлів з вихідними текстами\n"
-" -c=? читати зазначений файл конфігурації\n"
-" -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "Неправильне значення по замовчуванню!"
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
-msgid "Press enter to continue."
-msgstr "Для продовження натисніть Ввід."
-
-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr ""
-"Під час розпакування виникли помилки. Буде продовжено процес налаштування"
-
-#: dselect/install:101
-msgid "packages that were installed. This may result in duplicate errors"
-msgstr "встановлених пакунків. Це може призвести до повторення помилок або"
-
-#: dselect/install:102
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "виникненню нових через незадоволені залежності. Це нормально,"
-
-#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"важливі тільки помилки, зазначені вище. Виправте їх і виконаєте установку ще "
-"раз"
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr "Об'єднання інформації про доступні пакунки"
-
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Не вдалося створити канали (pipes)"
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Не вдалося виконати компресор gzip"
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr "Пошкоджений архів"
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
-
-#: apt-inst/contrib/extracttar.cc:296
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Невідомий тип заголовку TAR %u, член %s"
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Невірний підпис архіву"
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Неможливо прочитати заголовок \"member\" архіву"
-
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "Невірний заголовок \"member\" архіву"
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "Архів занадто малий"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Не вдалося прочитати заголовки архіву"
-
-#: apt-inst/filelist.cc:380
-#, fuzzy
-msgid "DropNode called on still linked node"
-msgstr "DropNode викликаний для вузла, який ще використовується"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Не вдалося знайти елемент хешу!"
-
-#: apt-inst/filelist.cc:459
-#, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "Не вдалося створити diversion"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Внутрішня помилка в AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, fuzzy, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Спроба зміни diversion, %s -> %s і %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, fuzzy, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Подвійне додавання diversion %s -> %s"
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Копія конфігураційного файлу %s/%s"
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Не вдалося записати файл %s"
-
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Не вдалося закрити файл %s"
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr "Шлях %s занадто довгий"
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Розпакування %s більш ніж один раз"
-
-#: apt-inst/extract.cc:134
-#, fuzzy, c-format
-msgid "The directory %s is diverted"
-msgstr "Тека %s входить до переліку diverted"
-
-#: apt-inst/extract.cc:144
-#, fuzzy, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Пакет пробує писати у diversion %s/%s"
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-#, fuzzy
-msgid "The diversion path is too long"
-msgstr "Шлях diversion занадто довгий"
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Тека %s замінюється не текою"
-
-#: apt-inst/extract.cc:280
-#, fuzzy
-msgid "Failed to locate node in its hash bucket"
-msgstr "Не вдалося розмістити вузол у хеші"
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Шлях занадто довгий"
-
-#: apt-inst/extract.cc:414
-#, fuzzy, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Файли заміняються вмістом пакета %s без версії"
-
-#: apt-inst/extract.cc:431
-#, fuzzy, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Файл %s/%s перезаписує інший з пакету %s"
-
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
-#, c-format
-msgid "Unable to read %s"
-msgstr "Неможливо прочитати %s"
-
-#: apt-inst/extract.cc:491
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Неможливо прочитати атрибути %s"
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, c-format
-msgid "Failed to remove %s"
-msgstr "Невдача видалення %s"
-
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, c-format
-msgid "Unable to create %s"
-msgstr "Неможливо створити %s"
-
-#: apt-inst/deb/dpkgdb.cc:114
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Не вдалося прочитати атрибути %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Теки info і temp повинні бути на тій самій файловій системі"
-
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
-msgid "Reading package lists"
-msgstr "Читання переліків пакетів"
-
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "Невдача зміни до адмінової теки %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr "Внутрішня помилка отримання назви пакунку"
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr "Читання переліку файлів"
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-"Не вдалося відкрити list файл '%sinfo/%s'. Якщо Ви не можете відновити цей "
-"файл, тоді зробіть його пустим і негайно реінсталюйте ту ж саму версію "
-"пакунка!"
-
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "Невдача читання list файла %sinfo/%s"
-
-#: apt-inst/deb/dpkgdb.cc:262
-#, fuzzy
-msgid "Internal error getting a node"
-msgstr "Внутрішня помилка при отриманні Node"
-
-#: apt-inst/deb/dpkgdb.cc:305
-#, fuzzy, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr "Не вдалося відкрити файл diversions %sdiversions"
-
-#: apt-inst/deb/dpkgdb.cc:320
-#, fuzzy
-msgid "The diversion file is corrupted"
-msgstr "Файл diversions пошкоджений"
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, fuzzy, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "Невірна лінія в файлі diversions: %s"
-
-#: apt-inst/deb/dpkgdb.cc:358
-#, fuzzy
-msgid "Internal error adding a diversion"
-msgstr "Внутрішня помилка при додаванні diversion"
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr "Кеш пакунків повинен бути ініціалізованим першим"
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, fuzzy, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr "Не вдалося знайти пакунок: заголовок, зсув %lu"
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, fuzzy, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Погана секція ConfFile у статусному файлі. Зсув %lu"
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, fuzzy, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr "Помилка обробки MD5. Зсув %lu"
-
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Невірний DEB архів, відсутній член '%s'"
-
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Невірний DEB архів, відсутній член '%s' чи '%s'"
-
-#: apt-inst/deb/debfile.cc:108
-#, c-format
-msgid "Couldn't change to %s"
-msgstr "Неможливо змінити %s"
-
-#: apt-inst/deb/debfile.cc:134
-msgid "Internal error, could not locate member"
-msgstr "Внутрішня помилка, не можу знайти member"
-
-#: apt-inst/deb/debfile.cc:167
-msgid "Failed to locate a valid control file"
-msgstr "Не вдалося знайти правильний контрольний (control) файл"
-
-#: apt-inst/deb/debfile.cc:252
-msgid "Unparsable control file"
-msgstr "Контрольний файл не можливо обробити"
-
-#: methods/cdrom.cc:114
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Неможливо прочитати базу %s з cdrom'у"
-
-#: methods/cdrom.cc:123
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"Будь-ласка використовуйте apt-cdrom, щоб APT розпізнав цей CD-ROM, apt-get "
-"update не може бути використаним для додання нових CD"
-
-#: methods/cdrom.cc:131
-msgid "Wrong CD-ROM"
-msgstr "Невірний CD-ROM"
-
-#: methods/cdrom.cc:166
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Неможливо демонтувати CDROM в %s, можливо він все ще використовується."
-
-#: methods/cdrom.cc:171
-msgid "Disk not found."
-msgstr "Диск не знайдено."
-
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "Файл не знайдено"
-
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
-msgid "Failed to stat"
-msgstr "Не вдалося одержати атрибути"
-
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
-#: methods/rred.cc:240
-msgid "Failed to set modification time"
-msgstr "Не вдалося встановити час модифікації"
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "Невірне посилання, локальні посилання повинні починатися з //"
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
-msgid "Logging in"
-msgstr "Логінюсь в"
-
-#: methods/ftp.cc:168
-msgid "Unable to determine the peer name"
-msgstr "Неможливо визначити назву вузла"
-
-#: methods/ftp.cc:173
-msgid "Unable to determine the local name"
-msgstr "Неможливо визначити локальну назву"
-
-#: methods/ftp.cc:204 methods/ftp.cc:232
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Сервер розірвав з'єднання і мовив: %s"
-
-#: methods/ftp.cc:210
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "USER невдало, сервер мовив: %s"
-
-#: methods/ftp.cc:217
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "PASS невдало, сервер мовив: %s"
-
-#: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin "
-"пустий."
-
-#: methods/ftp.cc:265
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Команда '%s'скрипту логіна не вдалася, сервер мовив: %s"
-
-#: methods/ftp.cc:291
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "TYPE невдало, сервер мовив: %s"
-
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "Час з'єднання вичерпався"
-
-#: methods/ftp.cc:335
-msgid "Server closed the connection"
-msgstr "Сервер закрив з'єднання"
-
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
-msgid "Read error"
-msgstr "Помилка читання"
-
-#: methods/ftp.cc:345 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr "Відповідь переповнила буфер."
-
-#: methods/ftp.cc:362 methods/ftp.cc:374
-msgid "Protocol corruption"
-msgstr "Спотворений протокол"
-
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
-msgid "Write error"
-msgstr "Помилка запису"
-
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
-msgid "Could not create a socket"
-msgstr "Неможливо створити сокет (socket)"
-
-#: methods/ftp.cc:698
-msgid "Could not connect data socket, connection timed out"
-msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
-
-#: methods/ftp.cc:704
-msgid "Could not connect passive socket."
-msgstr "Неможливо під'єднати пасивний сокет (passive socket)."
-
-#: methods/ftp.cc:722
-#, fuzzy
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Виклик getaddrinfo не зміг отримати сокет"
-
-#: methods/ftp.cc:736
-msgid "Could not bind a socket"
-msgstr "Неможливо приєднатися до сокета"
-
-#: methods/ftp.cc:740
-#, fuzzy
-msgid "Could not listen on the socket"
-msgstr "Не можливо утримувати з'єднання на сокеті"
-
-#: methods/ftp.cc:747
-msgid "Could not determine the socket's name"
-msgstr "Не вдалося визначити назву сокета"
-
-#: methods/ftp.cc:779
-msgid "Unable to send PORT command"
-msgstr "Неможливо відіслати команду PORT"
-
-#: methods/ftp.cc:789
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Невідоме адресове сімейство %u (AF_*)"
-
-#: methods/ftp.cc:798
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "EPRT невдало, сервер мовив: %s"
-
-#: methods/ftp.cc:818
-msgid "Data socket connect timed out"
-msgstr "Час з'єднання з сокетом даних вичерпався"
-
-#: methods/ftp.cc:825
-msgid "Unable to accept connection"
-msgstr "Неможливо прийняти з'єднання"
-
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr "Проблема хешування файла"
-
-#: methods/ftp.cc:877
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Неможливо завантажити файл, сервер мовив: '%s'"
-
-#: methods/ftp.cc:892 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr "Час з'єднання з сокетом (socket) з даними вичерпався"
-
-#: methods/ftp.cc:922
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Передача даних обірвалася, сервер мовив '%s'"
-
-#. Get the files information
-#: methods/ftp.cc:997
-msgid "Query"
-msgstr "Черга"
-
-#: methods/ftp.cc:1109
-msgid "Unable to invoke "
-msgstr "Неможливо викликати "
-
-#: methods/connect.cc:64
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "З'єднання з %s (%s)"
-
-#: methods/connect.cc:71
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
-
-#: methods/connect.cc:80
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)"
-
-#: methods/connect.cc:86
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Неможливо ініціалізувати з'єднання з %s:%s (%s)."
-
-#: methods/connect.cc:93
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
-
-#: methods/connect.cc:108
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Не можливо під'єднатися до %s:%s (%s)."
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "З'єднання з %s"
-
-#: methods/connect.cc:167
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Не можу знайти IP адрес для %s"
-
-#: methods/connect.cc:173
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Тимчасова помилка при отриманні IP адреси '%s'"
-
-#: methods/connect.cc:176
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)"
-
-#: methods/connect.cc:223
-#, c-format
-msgid "Unable to connect to %s %s:"
-msgstr "Не можливо під'єднатися до %s %s:"
-
-#: methods/gpgv.cc:65
-#, fuzzy, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Неможливо отримати доступ до keyring: '%s'"
-
-#: methods/gpgv.cc:100
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
-
-#: methods/gpgv.cc:204
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
-"відбиток?!"
-
-#: methods/gpgv.cc:209
-msgid "At least one invalid signature was encountered."
-msgstr "Знайдено як мінімум один невірний підпис."
-
-#: methods/gpgv.cc:213
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr "Неможливо виконати '%s' для перевірки підпису, gnupg встановлено?"
-
-#: methods/gpgv.cc:218
-msgid "Unknown error executing gpgv"
-msgstr "Невідома помилка виконання gpgv"
-
-#: methods/gpgv.cc:249
-msgid "The following signatures were invalid:\n"
-msgstr "Слідуючі підписи були невірними:\n"
-
-#: methods/gpgv.cc:256
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-"Слідуючі підписи не можуть бути перевірені, тому що, публічний ключ "
-"відсутній:\n"
-
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Неможливо відкрити канал (pipe) для %s"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Помилка читання з процесу %s"
-
-#: methods/http.cc:377
-msgid "Waiting for headers"
-msgstr "Очікування на заголовки"
-
-#: methods/http.cc:523
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr "Отримано одну заголовкову лінію понад %u символів"
-
-#: methods/http.cc:531
-msgid "Bad header line"
-msgstr "Невірна лінія заголовку"
-
-#: methods/http.cc:550 methods/http.cc:557
-msgid "The HTTP server sent an invalid reply header"
-msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
-
-#: methods/http.cc:586
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
-
-#: methods/http.cc:601
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
-
-#: methods/http.cc:603
-msgid "This HTTP server has broken range support"
-msgstr "Цей HTTP сервер має поламану підтримку 'range'"
-
-#: methods/http.cc:627
-msgid "Unknown date format"
-msgstr "Невідомий формат дати"
-
-#: methods/http.cc:774
-msgid "Select failed"
-msgstr "Вибір не вдався"
-
-#: methods/http.cc:779
-msgid "Connection timed out"
-msgstr "Час очікування з'єднання вийшов"
-
-#: methods/http.cc:802
-msgid "Error writing to output file"
-msgstr "Помилка запису в вихідний файл"
-
-#: methods/http.cc:833
-#, fuzzy
-msgid "Error writing to file"
-msgstr "Помилка запису в файл"
-
-#: methods/http.cc:861
-#, fuzzy
-msgid "Error writing to the file"
-msgstr "Помилка запису в файл"
-
-#: methods/http.cc:875
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
-
-#: methods/http.cc:877
-msgid "Error reading from server"
-msgstr "Помилка читання з сервера"
-
-#: methods/http.cc:1108
-msgid "Bad header data"
-msgstr "Погана заголовкова інформація"
-
-#: methods/http.cc:1125
-msgid "Connection failed"
-msgstr "З'єднання не вдалося"
-
-#: methods/http.cc:1216
-msgid "Internal error"
-msgstr "Внутрішня помилка"
-
-#: apt-pkg/contrib/mmap.cc:78
-msgid "Can't mmap an empty file"
-msgstr "Неможливо відобразити в пам'яті пустий файл"
-
-#: apt-pkg/contrib/mmap.cc:83
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Неможливо відобразити в пам'яті %lu байт"
-
-#: apt-pkg/contrib/strutl.cc:978
-#, c-format
-msgid "Selection %s not found"
-msgstr "Вибір %s не знайдено"
-
-#: apt-pkg/contrib/configuration.cc:433
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Нерозпізнаваний тип абревіатури: '%c'"
-
-#: apt-pkg/contrib/configuration.cc:491
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Відкривається конфігураційний файл %s"
-
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
-msgstr "Лінія %d занадто довга (максимум %d)"
-
-#: apt-pkg/contrib/configuration.cc:605
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Синтаксова помилка %s:%u: Блок починається без назви."
-
-#: apt-pkg/contrib/configuration.cc:624
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Синтаксова помилка %s:%u: спотворений тег"
-
-#: apt-pkg/contrib/configuration.cc:641
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Синтаксова помилка %s:%u: зайві символи після величини"
-
-#: apt-pkg/contrib/configuration.cc:681
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на "
-"найвищому рівні"
-
-#: apt-pkg/contrib/configuration.cc:688
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень"
-
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Синтаксова помилка %s:%u: Включена звідси"
-
-#: apt-pkg/contrib/configuration.cc:701
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується"
-
-#: apt-pkg/contrib/configuration.cc:735
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла"
-
-#: apt-pkg/contrib/progress.cc:152
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Помилка!"
-
-#: apt-pkg/contrib/progress.cc:154
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Виконано"
-
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Невідомий параметр '%c' [з %s] командного рядка."
-
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Незрозумілий параметр %s командного рядка"
-
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Не логічний параметр %s командного рядка"
-
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Параметр %s потребує аргумента."
-
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-
-#: apt-pkg/contrib/cmndline.cc:234
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Параметр %s потребує integer аргумент, але не '%s'"
-
-#: apt-pkg/contrib/cmndline.cc:265
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Параметр '%s' занадто довгий"
-
-#: apt-pkg/contrib/cmndline.cc:298
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Незрозумілий вираз %s , спробуйте true чи false."
-
-#: apt-pkg/contrib/cmndline.cc:348
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Невірна дія %s"
-
-#: apt-pkg/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Неможливо прочитати атрибути точки монтування %s"
-
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Неможливо зробити зміни у %s"
-
-#: apt-pkg/contrib/cdromutl.cc:187
-msgid "Failed to stat the cdrom"
-msgstr "Не вдалося прочитати атрибути cdrom"
-
-#: apt-pkg/contrib/fileutl.cc:80
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Блокування не використовується, так як файл блокування %s доступний тільки "
-"для читання"
-
-#: apt-pkg/contrib/fileutl.cc:85
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Не можливо відкрити lock файл %s"
-
-#: apt-pkg/contrib/fileutl.cc:103
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Блокування не використовується, так як файл блокування %s знаходиться на "
-"файловій системі nfs"
-
-#: apt-pkg/contrib/fileutl.cc:107
-#, fuzzy, c-format
-msgid "Could not get lock %s"
-msgstr "Не можливо отримати lock %s"
-
-#: apt-pkg/contrib/fileutl.cc:375
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Очікується на %s але його тут немає"
-
-#: apt-pkg/contrib/fileutl.cc:385
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Підпроцес %s отримав segmentation fault."
-
-#: apt-pkg/contrib/fileutl.cc:388
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Підпроцес %s повернув код помилки (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:390
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Підпроцес %s раптово завершився"
-
-#: apt-pkg/contrib/fileutl.cc:434
-#, c-format
-msgid "Could not open file %s"
-msgstr "Не можливо відкрити файл %s"
-
-#: apt-pkg/contrib/fileutl.cc:490
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr ""
-"помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема"
-
-#: apt-pkg/contrib/fileutl.cc:520
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли"
-
-#: apt-pkg/contrib/fileutl.cc:595
-msgid "Problem closing the file"
-msgstr "Проблема з закриттям файла"
-
-#: apt-pkg/contrib/fileutl.cc:601
-msgid "Problem unlinking the file"
-msgstr "Проблема з роз'єднанням файла"
-
-#: apt-pkg/contrib/fileutl.cc:612
-msgid "Problem syncing the file"
-msgstr "Проблема з синхронізацією файла"
-
-#: apt-pkg/pkgcache.cc:132
-msgid "Empty package cache"
-msgstr "Кеш пакунків пустий"
-
-#: apt-pkg/pkgcache.cc:138
-msgid "The package cache file is corrupted"
-msgstr "Файл кешу пакунків пошкоджений"
-
-#: apt-pkg/pkgcache.cc:143
-msgid "The package cache file is an incompatible version"
-msgstr "Файл кешу пакунків має несумісну версію"
-
-#: apt-pkg/pkgcache.cc:148
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "APT не підтримує систему призначення версій '%s'"
-
-#: apt-pkg/pkgcache.cc:153
-msgid "The package cache was built for a different architecture"
-msgstr "Кеш пакунків був побудований для іншої архітектури"
-
-#: apt-pkg/pkgcache.cc:224
-msgid "Depends"
-msgstr "Залежності (Depends)"
-
-#: apt-pkg/pkgcache.cc:224
-msgid "PreDepends"
-msgstr "Пре-Залежності (PreDepends)"
-
-#: apt-pkg/pkgcache.cc:224
-msgid "Suggests"
-msgstr "Пропонує (Suggests)"
-
-#: apt-pkg/pkgcache.cc:225
-msgid "Recommends"
-msgstr "Рекомендує"
-
-#: apt-pkg/pkgcache.cc:225
-msgid "Conflicts"
-msgstr "Конфлікти"
-
-#: apt-pkg/pkgcache.cc:225
-msgid "Replaces"
-msgstr "Заміняє (Replaces)"
-
-#: apt-pkg/pkgcache.cc:226
-msgid "Obsoletes"
-msgstr "Застарілі (Obsoletes)"
-
-#: apt-pkg/pkgcache.cc:226
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:237
-msgid "important"
-msgstr "Важливі (Important)"
-
-#: apt-pkg/pkgcache.cc:237
-msgid "required"
-msgstr "Необхідні (Required)"
-
-#: apt-pkg/pkgcache.cc:237
-msgid "standard"
-msgstr "Стандартні (Standard)"
-
-#: apt-pkg/pkgcache.cc:238
-msgid "optional"
-msgstr "Необов'язкові (Optional)"
-
-#: apt-pkg/pkgcache.cc:238
-msgid "extra"
-msgstr "Додаткові (Extra)"
-
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
-
-#: apt-pkg/depcache.cc:101
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
-
-#: apt-pkg/depcache.cc:130
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
-
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
-#, fuzzy
-msgid "Reading state information"
-msgstr "Об'єднання інформації про доступні пакунки"
-
-#: apt-pkg/depcache.cc:198
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити %s"
-
-#: apt-pkg/depcache.cc:204
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати файл %s"
-
-#: apt-pkg/tagfile.cc:102
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Неможливо обробити файл %s пакунку (1)"
-
-#: apt-pkg/tagfile.cc:189
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Неможливо обробити файл %s пакунку (2)"
-
-#: apt-pkg/sourcelist.cc:90
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)"
-
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-"Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)"
-
-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)"
-
-#: apt-pkg/sourcelist.cc:101
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:108
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
-
-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Opening %s"
-msgstr "Відкриття %s"
-
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Лінія %u занадто довга в переліку джерел %s."
-
-#: apt-pkg/sourcelist.cc:236
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Спотворена лінія %u у переліку джерел %s (тип)"
-
-#: apt-pkg/sourcelist.cc:240
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s"
-
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)"
-
-#: apt-pkg/packagemanager.cc:399
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Для виконання даного встановлення потрібне тимчасове видалення важливого "
-"пакету %s через конфлікти/петлеві пре-залежності (Pre-Depends loop). Це "
-"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
-"LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:34
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Тип '%s' індексного файлу не підтримується"
-
-#: apt-pkg/algorithms.cc:247
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для "
-"нього."
-
-#: apt-pkg/algorithms.cc:1103
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
-"пов'язано з зафіксованими пакунками."
-
-#: apt-pkg/algorithms.cc:1105
-msgid "Unable to correct problems, you have held broken packages."
-msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки."
-
-#: apt-pkg/acquire.cc:59
-#, c-format
-msgid "Lists directory %spartial is missing."
-msgstr "Lists тека %spartial відсутня."
-
-#: apt-pkg/acquire.cc:63
-#, c-format
-msgid "Archive directory %spartial is missing."
-msgstr "Архівна тека %spartial відсутня."
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:827
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Завантажується файл %li з %li (%s залишилось)"
-
-#: apt-pkg/acquire.cc:829
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Завантажується файл %li з %li"
-
-#: apt-pkg/acquire-worker.cc:110
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не знайдено."
-
-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s не стартував коректно"
-
-#: apt-pkg/acquire-worker.cc:381
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
-
-#: apt-pkg/init.cc:126
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Система пакування '%s' не підтримується"
-
-#: apt-pkg/init.cc:142
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Неможливо визначити тип необхідної системи пакування "
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неможливо прочитати атрибути %s."
-
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Ви повинні записати певні 'source' посилання в твій sources.list"
-
-#: apt-pkg/cachefile.cc:69
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл."
-
-#: apt-pkg/cachefile.cc:73
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get"
-
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
-msgstr "Невірний запис в preferences файлі, відсутній заголовок Package"
-
-#: apt-pkg/policy.cc:289
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Не зрозумів тип %s для pin"
-
-#: apt-pkg/policy.cc:297
-msgid "No priority (or zero) specified for pin"
-msgstr "Не встановлено пріоритету (або встановлено 0) для pin"
-
-#: apt-pkg/pkgcachegen.cc:72
-msgid "Cache has an incompatible versioning system"
-msgstr "Кеш має несумісну систему призначення версій"
-
-#: apt-pkg/pkgcachegen.cc:115
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:130
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:153
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:178
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:182
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:213
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:217
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:221
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ви перевищили кількість імен пакунків, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ви перевищили кількість версій, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:257
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ви перевищили кількість версій, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ви перевищили кількість залежностей які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:288
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:301
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:307
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла"
-
-#: apt-pkg/pkgcachegen.cc:678
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
-
-#: apt-pkg/pkgcachegen.cc:763
-#, fuzzy
-msgid "Collecting File Provides"
-msgstr "Збирання інформації про файлів "
-
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
-msgid "IO Error saving source cache"
-msgstr "Помилка IO під час збереження джерельного кешу"
-
-#: apt-pkg/acquire-item.cc:127
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "Не вдалося перейменувати, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
-msgid "MD5Sum mismatch"
-msgstr "Невідповідність MD5Sum"
-
-#: apt-pkg/acquire-item.cc:1106
-#, fuzzy
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Відсутній публічний ключ для заданих ID ключа:\n"
-
-#: apt-pkg/acquire-item.cc:1219
-#, 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. Можливо, Ви захочете власноруч "
-"виправити цей пакунок. (due to missing arch)"
-
-#: apt-pkg/acquire-item.cc:1278
-#, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
-msgstr ""
-"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
-"виправити цей пакунок."
-
-#: apt-pkg/acquire-item.cc:1314
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s."
-
-#: apt-pkg/acquire-item.cc:1401
-msgid "Size mismatch"
-msgstr "Невідповідність розміру"
-
-#: apt-pkg/vendorlist.cc:66
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Блок постачальника %s не містить відбитку (fingerprint)"
-
-#: apt-pkg/cdrom.cc:529
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Використовується точка монтування CDROM: %s\n"
-"Монтування CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620
-msgid "Identifying.. "
-msgstr "Ідентифікація.. "
-
-#: apt-pkg/cdrom.cc:563
-#, c-format
-msgid "Stored label: %s \n"
-msgstr "Записано мітку: %s \n"
-
-#: apt-pkg/cdrom.cc:583
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "Використовується точка монтування CDROM: %s\n"
-
-#: apt-pkg/cdrom.cc:601
-msgid "Unmounting CD-ROM\n"
-msgstr "Демонтується CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:605
-msgid "Waiting for disc...\n"
-msgstr "Чекаю на диск...\n"
-
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:613
-msgid "Mounting CD-ROM...\n"
-msgstr "Монтується CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:631
-msgid "Scanning disc for index files..\n"
-msgstr "Диск сканується на індексні файли..\n"
-
-#: apt-pkg/cdrom.cc:671
-#, fuzzy, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
-msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n"
-
-#: apt-pkg/cdrom.cc:708
-#, fuzzy, c-format
-msgid "Found label '%s'\n"
-msgstr "Записано мітку: %s \n"
-
-#: apt-pkg/cdrom.cc:737
-msgid "That is not a valid name, try again.\n"
-msgstr "Не є вірною назвою, спробуйте ще.\n"
-
-#: apt-pkg/cdrom.cc:753
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-"Цей диск зветься: \n"
-"'%s'\n"
-
-#: apt-pkg/cdrom.cc:757
-msgid "Copying package lists..."
-msgstr "Копіюються переліки пакунків..."
-
-#: apt-pkg/cdrom.cc:783
-msgid "Writing new source list\n"
-msgstr "Записується новий перелік джерел\n"
-
-#: apt-pkg/cdrom.cc:792
-msgid "Source list entries for this disc are:\n"
-msgstr "Перелік джерел для цього диску:\n"
-
-#: apt-pkg/cdrom.cc:834
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Демонтується CD-ROM..."
-
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Записано %i записів.\n"
-
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Записано %i записів з %i відсутніми файлами.\n"
-
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Записано %i записів з %i невідповідними файлам\n"
-
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
-
-#: apt-pkg/deb/dpkgpm.cc:355
-#, c-format
-msgid "Preparing %s"
-msgstr "Підготовка %s"
-
-#: apt-pkg/deb/dpkgpm.cc:356
-#, c-format
-msgid "Unpacking %s"
-msgstr "Розпакування %s"
-
-#: apt-pkg/deb/dpkgpm.cc:361
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Підготовка до конфігурації %s"
-
-#: apt-pkg/deb/dpkgpm.cc:362
-#, c-format
-msgid "Configuring %s"
-msgstr "Конфігурація %s"
-
-#: apt-pkg/deb/dpkgpm.cc:363
-#, c-format
-msgid "Installed %s"
-msgstr "Встановлено %s"
-
-#: apt-pkg/deb/dpkgpm.cc:368
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Підготовка до видалення %s"
-
-#: apt-pkg/deb/dpkgpm.cc:369
-#, c-format
-msgid "Removing %s"
-msgstr "Видаляється %s"
-
-#: apt-pkg/deb/dpkgpm.cc:370
-#, c-format
-msgid "Removed %s"
-msgstr "Видалено %s"
-
-#: apt-pkg/deb/dpkgpm.cc:375
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Підготовка до повного видалення %s"
-
-#: apt-pkg/deb/dpkgpm.cc:376
-#, c-format
-msgid "Completely removed %s"
-msgstr "Повністю видалено %s"
-
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Неможливо накласти латку на файл"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "З'єднання завершено передчасно"
diff --git a/po/vi.po b/po/vi.po
index 7cec3c1e2..19fc1f997 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 22:26+0200\n"
-"PO-Revision-Date: 2007-06-21 15:56+0930\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
+"PO-Revision-Date: 2007-06-01 15:00+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.6.4a1\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
#: cmdline/apt-cache.cc:143
#, c-format
@@ -57,8 +57,9 @@ msgid "Total distinct versions: "
msgstr "Tổng số phiên bản riêng: "
#: cmdline/apt-cache.cc:295
+#, fuzzy
msgid "Total Distinct Descriptions: "
-msgstr "Tổng số mô tả riêng: "
+msgstr "Tổng số phiên bản riêng: "
#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
@@ -69,8 +70,9 @@ msgid "Total ver/file relations: "
msgstr "Tổng số liên quan phiên bản và tập tin: "
#: cmdline/apt-cache.cc:302
+#, fuzzy
msgid "Total Desc/File relations: "
-msgstr "Tổng số liên quan mô tả/tập tin:"
+msgstr "Tổng số liên quan phiên bản và tập tin: "
#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
@@ -160,7 +162,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
@@ -684,7 +686,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
msgid "Y"
msgstr "C"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
@@ -847,11 +849,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thư mục tải về"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
@@ -881,7 +883,7 @@ msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -911,7 +913,7 @@ msgstr ""
"Để tiếp tục thì hãy gõ cụm từ « %s »\n"
"?]"
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Hủy bỏ."
@@ -919,7 +921,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
@@ -928,7 +930,7 @@ msgstr "Việc gói %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
@@ -1045,64 +1047,63 @@ msgstr ""
#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
+msgstr ""
#: cmdline/apt-get.cc:1465
+#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr ""
-"Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
+msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
#: cmdline/apt-get.cc:1467
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
+msgstr ""
#: cmdline/apt-get.cc:1472
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không "
-"nên xảy ra. Hãy thông báo lỗi về apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
#: cmdline/apt-get.cc:1479
+#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
+msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
-#: cmdline/apt-get.cc:1543
-#, c-format
+#: cmdline/apt-get.cc:1544
+#, fuzzy, c-format
msgid "Couldn't find task %s"
-msgstr "Không tìm thấy tác vụ %s"
+msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
-#: cmdline/apt-get.cc:1711
-#, c-format
+#: cmdline/apt-get.cc:1712
+#, fuzzy, c-format
msgid "%s set to manual installed.\n"
-msgstr "%s được đặt thành « được cài đặt thủ công ».\n"
+msgstr "nhưng mà %s sẽ được cài đặt"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1110,7 +1111,7 @@ msgstr ""
"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1122,7 +1123,7 @@ msgstr ""
"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1132,123 +1133,138 @@ msgstr ""
"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
"thông báo lỗi về gói này."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Gói bị ngắt"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "Đang tính nâng cấp... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1257,31 +1273,32 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1340,7 +1357,6 @@ msgstr ""
" upgrade \t_Nâng cập_ \n"
" install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n"
" remove \t_Gỡ bỏ_ gói\n"
-" purge\t\tGỡ bỏ và _tẩy_ gói\n"
" source \t\tTải về kho _nguồn_\n"
" build-dep \tĐịnh cấu hình _cách phụ thuộc khi xây dụng_, cho gói nguồn\n"
" dist-upgrade \t_Nâng cấp bản phân phối_,\n"
@@ -1599,9 +1615,9 @@ msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Không thể đọc %s"
@@ -1903,7 +1919,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Gặp khó khăn băm tập tin"
@@ -1930,39 +1946,39 @@ msgstr "Truy vấn"
msgid "Unable to invoke "
msgstr "Không thể gọi "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Đang kết nối đến %s (%s)..."
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[Địa chỉ IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Không thể sở khởi kết nối đến %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Không thể kết nối đến %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Đang kết nối đến %s..."
@@ -2036,80 +2052,80 @@ msgstr "Không thể mở ống dẫn cho %s"
msgid "Read error from %s process"
msgstr "Gặp lỗi đọc từ tiến trình %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Đang đợi những phần đầu..."
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Dòng đầu sai"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
"hợp lệ"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
"hợp lệ"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Không biết dạng ngày"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
@@ -2127,57 +2143,57 @@ msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Không nhận biết viết tắt kiểu: « %c »"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Đang mở tập tin cấu hình %s..."
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Dòng %d quá dài (tối đa %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
@@ -2244,6 +2260,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Không thể chuyển đổi sang %s"
@@ -2370,7 +2387,7 @@ msgstr "Làm cũ"
#: apt-pkg/pkgcache.cc:226
msgid "Breaks"
-msgstr "Làm hư"
+msgstr ""
#: apt-pkg/pkgcache.cc:237
msgid "important"
@@ -2405,18 +2422,19 @@ msgid "Dependency generation"
msgstr "Tạo ra cách phụ thuộc"
#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#, fuzzy
msgid "Reading state information"
-msgstr "Đang đọc thông tin tình trạng"
+msgstr "Đang hợp nhất các thông tin sẵn sàng..."
#: apt-pkg/depcache.cc:198
-#, c-format
+#, fuzzy, c-format
msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+msgstr "Việc mở %s bị lỗi"
#: apt-pkg/depcache.cc:204
-#, c-format
+#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s"
+msgstr "Việc ghi tập tin %s bị lỗi"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2493,7 +2511,7 @@ msgstr ""
"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak "
"» (buộc ngắt vòng lặp)."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
@@ -2612,9 +2630,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
#: apt-pkg/pkgcachegen.cc:153
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
#: apt-pkg/pkgcachegen.cc:178
#, c-format
@@ -2642,9 +2660,9 @@ msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2655,8 +2673,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
#: apt-pkg/pkgcachegen.cc:257
+#, fuzzy
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý."
+msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2692,21 +2711,21 @@ msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
msgid "IO Error saving source cache"
msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2715,7 +2734,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2724,7 +2743,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2732,7 +2751,7 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
@@ -2782,12 +2801,11 @@ msgid "Scanning disc for index files..\n"
msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
#: apt-pkg/cdrom.cc:671
-#, c-format
+#, fuzzy, c-format
msgid ""
"Found %i package indexes, %i source indexes, %i translation indexes and %i "
"signatures\n"
-msgstr ""
-"Tìm thấy %i chỉ mục gói, %i chỉ mục nguồn, %i chỉ mục dịch và %i chữ ký\n"
+msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n"
#: apt-pkg/cdrom.cc:708
#, c-format
@@ -2845,59 +2863,60 @@ msgstr ""
"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
"nhau\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "Đang chuẩn bị %s..."
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "Đang mở gói %s..."
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "Đang chuẩn bị cấu hình %s..."
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "Đang cấu hình %s..."
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "Đã cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "Đang chuẩn bị gỡ bỏ %s..."
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "Đang gỡ bỏ %s..."
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "Đã gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..."
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "Mới gỡ bỏ hoàn toàn %s"
#: methods/rred.cc:219
+#, fuzzy
msgid "Could not patch file"
-msgstr "Không thể vá lỗi trong tập tin %s"
+msgstr "Không thể mở tập tin %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fe5108046..1ed92a494 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-03-29 17:14+0800\n"
"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s ，编译于 %s %s\n"
@@ -652,7 +652,7 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -813,11 +813,11 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误，Ordering 未能完成"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
@@ -846,7 +846,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
@@ -875,7 +875,7 @@ msgstr ""
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "中止执行。"
@@ -883,7 +883,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -892,7 +892,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
@@ -1025,7 +1025,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对解决问题有所帮助："
@@ -1038,31 +1038,31 @@ msgstr "内部错误，problem resolver 坏事了"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误，AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1070,7 +1070,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1081,7 +1081,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1090,122 +1090,137 @@ msgstr ""
"您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包："
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误，problem resolver 坏事了"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1214,30 +1229,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "被支持模块："
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1541,9 +1556,9 @@ msgstr "用来覆盖的软件包不属于 %s 的任何版本"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1840,7 +1855,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1867,39 +1882,39 @@ msgstr "查询"
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s)，连接超时"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
@@ -1971,76 +1986,76 @@ msgstr "无法为 %s 开启管道"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "内部错误"
@@ -2058,57 +2073,57 @@ msgstr "无法 mmap %lu 字节的数据"
msgid "Selection %s not found"
msgstr "没有发现您的所选 %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写：“%c”"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u：配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u：标签格式有误"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u: 不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
@@ -2175,6 +2190,7 @@ msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
@@ -2421,7 +2437,7 @@ msgstr ""
"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
"Force-LoopBreak 选项。"
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
@@ -2538,7 +2554,7 @@ msgstr "处理 %s (UsePackage1)时出错"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "处理 %s (NewFileVer1)时出错"
#: apt-pkg/pkgcachegen.cc:178
@@ -2568,7 +2584,7 @@ msgstr "处理 %s (NewVersion2)时出错"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "处理 %s (NewFileVer1)时出错"
#: apt-pkg/pkgcachegen.cc:251
@@ -2616,21 +2632,21 @@ msgstr "正在收集文件所提供的软件包"
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2639,7 +2655,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2647,13 +2663,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "大小不符"
@@ -2764,52 +2780,52 @@ msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9cb4895fc..7d950c562 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-21 16:58+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -159,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
@@ -652,7 +652,7 @@ msgstr "無法將 %s 更名為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示法出錯 - %s"
@@ -813,11 +813,11 @@ msgstr "有套件需要被移除,但移除動作被禁止。"
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤，Ordering didn't finish"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載的目錄"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "無法讀取來源單。"
@@ -846,7 +846,7 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解壓縮後將空出 %sB 的空間。\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s 無法足夠的空間。"
@@ -875,7 +875,7 @@ msgstr ""
"若要繼續的話,就輸入下面的句子“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "放棄執行。"
@@ -883,7 +883,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法下載『%s』檔案。%s\n"
@@ -892,7 +892,7 @@ msgstr "無法下載『%s』檔案。%s\n"
msgid "Some files failed to download"
msgstr "部份檔案無法下載"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "下載完畢,目前是“僅下載”模式"
@@ -1024,7 +1024,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "底下的資訊有助於解決現在的情況:"
@@ -1037,31 +1037,31 @@ msgstr "內部錯誤，problem resolver 處理失敗"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "但是『%s』卻將被安裝。"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: cmdline/apt-get.cc:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1069,7 +1069,7 @@ msgstr ""
"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
"定一個解決辦法)。"
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1080,7 +1080,7 @@ msgstr ""
"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
"或從 Incoming 目錄移除。"
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1090,122 +1090,137 @@ msgstr ""
"該套件無法安裝,您最好提交一個針對這個套件\n"
"的臭蟲報告。"
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "下列的【新】套件都將被安裝："
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
msgid "Calculating upgrade... "
msgstr "籌畫升級套件中..."
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤，problem resolver 處理失敗"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "必須指定至少一個對應的套件才能下載源碼"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 套件的源碼"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已被下載的檔案“%s”\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, c-format
msgid "Fetch source %s\n"
msgstr "下載源碼 %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "無法下載某些檔案。"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "執行建立套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的建構相依關係。"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相依關係訊息。\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1214,30 +1229,30 @@ msgstr ""
"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
"相依關係"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所要求的建構相依關係。"
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "無法處理建構相依關係"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
msgid "Supported modules:"
msgstr "支援模組:"
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1543,9 +1558,9 @@ msgstr "複寫套件 %s 無符合版本"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取『%s』。"
@@ -1841,7 +1856,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法允許連線"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
@@ -1868,39 +1883,39 @@ msgstr "查詢"
msgid "Unable to invoke "
msgstr "無法讀取 "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "連絡『%s (%s)』中"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "無法聯絡到主機『%s:%s (%s)』。"
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "無法聯絡到主機『%s:%s (%s)』。"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "無法聯絡到主機『%s:%s (%s)』。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "聯絡主機『%s』中"
@@ -1972,76 +1987,76 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "從 %s 進程讀取錯誤"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "壞的標頭"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http 伺服器傳送一個無效的回覆標頭"
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http 伺服器有損毀的範圍支援"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "從遠端主機讀取錯誤，關閉連線"
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "內部錯誤"
@@ -2059,57 +2074,57 @@ msgstr "無法讀入檔案 %lu 位元組至記憶體"
msgid "Selection %s not found"
msgstr "選項『%s』找不到。"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "不認識的簡寫類型：%c"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "開啟組態檔 %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "第 %d 行太長（最長 %d）"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "語法錯誤 %s:%u: 區塊沒有名稱"
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "語法錯誤 %s:%u: 無效的標籤"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "語法錯誤 %s:%u: 太多重複引入檔案"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "語法錯誤 %s:%u: 從此引入"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
@@ -2176,6 +2191,7 @@ msgid "Unable to stat the mount point %s"
msgstr "無法讀取掛載點 %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "無法進入『%s』目錄。"
@@ -2421,7 +2437,7 @@ msgstr ""
"此安裝因衝突或特別依存關係，需暫時刪除『%s』這個重要套件。這種情形通常有問"
"題，但您確定的話請啟動『APT::Force-LoopBreak』選項。"
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "本軟體不支持『%s』型的索引檔。"
@@ -2534,7 +2550,7 @@ msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
#: apt-pkg/pkgcachegen.cc:178
@@ -2564,7 +2580,7 @@ msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
#: apt-pkg/pkgcachegen.cc:251
@@ -2612,41 +2628,41 @@ msgstr "收集檔案供應"
msgid "IO Error saving source cache"
msgstr "無法寫入來源暫存檔。"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 沒有可用的公鑰：\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "檔案大小不符合。"
@@ -2757,52 +2773,52 @@ msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr "準備配置%s中"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr "解開%s中"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr "準備設定%s檔"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr "設定%s中"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr "已安裝%s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在準備 %s 的刪除操作"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr "移除%s中"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr "已移除%s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr "準備完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr "已完整移除%s"
diff --git a/share/debian-archive.gpg.moved b/share/debian-archive.gpg.moved
new file mode 100644
index 000000000..bb5ed5033
--- /dev/null
+++ b/share/debian-archive.gpg.moved
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 23:59:51 +0000