summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.progress-reporting49
-rw-r--r--apt-pkg/acquire.cc21
-rw-r--r--apt-pkg/contrib/configuration.cc46
-rw-r--r--apt-pkg/contrib/configuration.h7
-rw-r--r--apt-pkg/contrib/fileutl.cc24
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--apt-pkg/deb/dpkgpm.cc213
-rw-r--r--apt-pkg/deb/dpkgpm.h9
-rw-r--r--apt-pkg/packagemanager.cc4
-rw-r--r--apt-pkg/packagemanager.h2
-rw-r--r--cmdline/apt-get.cc22
-rw-r--r--configure.in2
-rw-r--r--debian/apt.manpages1
-rw-r--r--debian/changelog300
-rw-r--r--doc/examples/configure-index8
-rw-r--r--methods/gpgv.cc30
-rw-r--r--po/apt-all.pot28
-rw-r--r--po/bs.po130
-rw-r--r--po/ca.po295
-rw-r--r--po/cs.po131
-rw-r--r--po/cy.po841
-rw-r--r--po/da.po141
-rw-r--r--po/de.po152
-rw-r--r--po/el.po157
-rw-r--r--po/en_GB.po132
-rw-r--r--po/es.po131
-rw-r--r--po/eu.po121
-rw-r--r--po/fi.po131
-rw-r--r--po/fr.po266
-rw-r--r--po/he.po134
-rw-r--r--po/hu.po131
-rw-r--r--po/it.po131
-rw-r--r--po/ja.po131
-rw-r--r--po/ko.po131
-rw-r--r--po/nb.po131
-rw-r--r--po/nl.po131
-rw-r--r--po/nn.po131
-rw-r--r--po/pl.po131
-rw-r--r--po/pt.po165
-rw-r--r--po/pt_BR.po54
-rw-r--r--po/ro.po131
-rw-r--r--po/ru.po131
-rw-r--r--po/sk.po183
-rw-r--r--po/sl.po131
-rw-r--r--po/sv.po131
-rw-r--r--po/tl.po131
-rw-r--r--po/zh_CN.po131
-rw-r--r--po/zh_TW.po131
-rw-r--r--test/conf_clear.cc23
-rw-r--r--test/makefile6
50 files changed, 3352 insertions, 2574 deletions
diff --git a/README.progress-reporting b/README.progress-reporting
new file mode 100644
index 000000000..7ae514929
--- /dev/null
+++ b/README.progress-reporting
@@ -0,0 +1,49 @@
+Install-progress reporting
+--------------------------
+
+If the apt options: "APT::Status-Fd" is set, apt will send status
+reports to that fd. The status information is seperated with a ':',
+there are the following status conditions:
+
+status = {"pmstatus", "dlstatus", "conffile-prompt", "error" }
+
+The reason for using a fd instead of a OpProgress class is that many
+apt frontend fork a (vte) terminal for the actual installation.
+
+The reason to do the mapping and l10n of the dpkg states to human
+readable (and translatable) strings is that this way the translation
+needs to be done only once for all frontends.
+
+
+pmstatus
+--------
+Status of the package manager (dpkg). This is send when packages
+are installed/removed.
+pmstatus:pkgname:TotalPercentage:action-description
+
+PkgName = the name of the package
+TotalPercentage = the total progress between [0..100]
+description = a i18ned human readable decription of the current action
+
+
+Example:
+# ./apt-get install -o APT::Status-Fd=2 3dchess >/dev/null
+pmstatus:3dchess:20:Preparing 3dchess
+pmstatus:3dchess:40:Unpacking 3dchess
+pmstatus:3dchess:60:Preparing to configure 3dchess
+pmstatus:3dchess:80:Configuring 3dchess
+pmstatus:3dchess:100:Installed 3dchess
+
+
+dlstatus
+--------
+dlstatus:AlreadDownloaded:TotalPercentage:action-description
+
+AlreadyDownloaded = the number of already downloaded packages
+TotalPercentage = the total progress between [0..100]
+description = a i18ned human readable decription of the current action
+
+Example:
+dlstatus:1:9.05654:Downloading file 1 of 3 (4m40s remaining)
+dlstatus:1:9.46357:Downloading file 1 of 3 (4m39s remaining)
+dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining) \ No newline at end of file
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 70dce4f54..62209e65b 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -26,6 +26,7 @@
#include <apti18n.h>
#include <iostream>
+#include <sstream>
#include <dirent.h>
#include <sys/time.h>
@@ -803,6 +804,26 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
Time = NewTime;
}
+ int fd = _config->FindI("APT::Status-Fd",-1);
+ if(fd > 0)
+ {
+ ostringstream status;
+
+ char msg[200];
+ long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems;
+ unsigned long ETA =
+ (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS);
+
+ snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str());
+
+ // build the status str
+ status << "dlstatus:" << i
+ << ":" << (CurrentBytes/float(TotalBytes)*100.0)
+ << ":" << msg
+ << endl;
+ write(fd, status.str().c_str(), status.str().size());
+ }
+
return true;
}
/*}}}*/
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 69f8d1dca..4b2c0fbb5 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -327,15 +327,57 @@ void Configuration::Set(const char *Name,int Value)
Itm->Value = S;
}
/*}}}*/
+// Configuration::Clear - Clear an single value from a list /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void Configuration::Clear(string Name, int Value)
+{
+ char S[300];
+ snprintf(S,sizeof(S),"%i",Value);
+ Clear(Name, S);
+}
+ /*}}}*/
+// Configuration::Clear - Clear an single value from a list /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void Configuration::Clear(string Name, string Value)
+{
+ Item *Top = Lookup(Name.c_str(),false);
+ if (Top == 0 || Top->Child == 0)
+ return;
+
+ Item *Tmp, *Prev, *I;
+ Prev = I = Top->Child;
+
+ while(I != NULL)
+ {
+ if(I->Value == Value)
+ {
+ Tmp = I;
+ // was first element, point parent to new first element
+ if(Top->Child == Tmp)
+ Top->Child = I->Next;
+ I = I->Next;
+ Prev->Next = I;
+ delete Tmp;
+ } else {
+ Prev = I;
+ I = I->Next;
+ }
+ }
+
+}
+ /*}}}*/
// Configuration::Clear - Clear an entire tree /*{{{*/
// ---------------------------------------------------------------------
/* */
void Configuration::Clear(string Name)
{
Item *Top = Lookup(Name.c_str(),false);
- if (Top == 0)
+ if (Top == 0) {
+ cout << "config item: " << Name << " not found" << endl;
return;
-
+ }
Top->Value = string();
Item *Stop = Top;
Top = Top->Child;
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 0ed8f59d3..789bc82cf 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -87,8 +87,13 @@ class Configuration
bool Exists(const char *Name) const;
bool ExistsAny(const char *Name) const;
+ // clear a whole tree
void Clear(string Name);
-
+
+ // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
+ void Clear(string List, string Value);
+ void Clear(string List, int Value);
+
inline const Item *Tree(const char *Name) const {return Lookup(Name);};
inline void Dump() { Dump(std::clog); };
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 0ce0c9b9d..9fd71728e 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -20,6 +20,7 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sptr.h>
+#include <apt-pkg/configuration.h>
#include <apti18n.h>
@@ -32,6 +33,7 @@
#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
+#include <set>
/*}}}*/
using namespace std;
@@ -306,7 +308,7 @@ bool WaitFd(int Fd,bool write,unsigned long timeout)
/* This is used if you want to cleanse the environment for the forked
child, it fixes up the important signals and nukes all of the fds,
otherwise acts like normal fork. */
-pid_t ExecFork(int dontCloseThisFd)
+pid_t ExecFork()
{
// Fork off the process
pid_t Process = fork();
@@ -326,11 +328,27 @@ pid_t ExecFork(int dontCloseThisFd)
signal(SIGWINCH,SIG_DFL);
signal(SIGCONT,SIG_DFL);
signal(SIGTSTP,SIG_DFL);
-
+
+ set<int> KeepFDs;
+ Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds");
+ if (Opts != 0 && Opts->Child != 0)
+ {
+ Opts = Opts->Child;
+ for (; Opts != 0; Opts = Opts->Next)
+ {
+ if (Opts->Value.empty() == true)
+ continue;
+ int fd = atoi(Opts->Value.c_str());
+ KeepFDs.insert(fd);
+ }
+ }
+
// Close all of our FDs - just in case
for (int K = 3; K != 40; K++)
- if(K != dontCloseThisFd)
+ {
+ if(KeepFDs.find(K) == KeepFDs.end())
fcntl(K,F_SETFD,FD_CLOEXEC);
+ }
}
return Process;
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 4716e261e..041aa3309 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -87,7 +87,7 @@ string SafeGetCWD();
void SetCloseExec(int Fd,bool Close);
void SetNonBlock(int Fd,bool Block);
bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
-pid_t ExecFork(int dontCloseThisFd=-1);
+pid_t ExecFork();
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
// File string manipulators
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 61c48dcbb..2e85fc14e 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -25,7 +25,11 @@
#include <signal.h>
#include <errno.h>
#include <stdio.h>
-#include <iostream>
+#include <sstream>
+#include <map>
+
+#include <config.h>
+#include <apti18n.h>
/*}}}*/
using namespace std;
@@ -325,8 +329,14 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
/*}}}*/
// DPkgPM::Go - Run the sequence /*{{{*/
// ---------------------------------------------------------------------
-/* This globs the operations and calls dpkg */
-bool pkgDPkgPM::Go(int status_fd)
+/* This globs the operations and calls dpkg
+ *
+ * If it is called with "OutStatusFd" set to a valid file descriptor
+ * apt will report the install progress over this fd. It maps the
+ * dpkg states a package goes through to human readable (and i10n-able)
+ * names and calculates a percentage for each step.
+*/
+bool pkgDPkgPM::Go(int OutStatusFd)
{
unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);
unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
@@ -336,7 +346,66 @@ bool pkgDPkgPM::Go(int status_fd)
if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false)
return false;
+
+ // prepare the progress reporting
+ int Done = 0;
+ int Total = 0;
+ // map the dpkg states to the operations that are performed
+ // (this is sorted in the same way as Item::Ops)
+ static const struct DpkgState DpkgStatesOpMap[][5] = {
+ // Install operation
+ {
+ {"half-installed", _("Preparing %s")},
+ {"unpacked", _("Unpacking %s") },
+ NULL
+ },
+ // Configure operation
+ {
+ {"unpacked",_("Preparing to configure %s") },
+ {"half-configured", _("Configuring %s") },
+ { "installed", _("Installed %s")},
+ NULL
+ },
+ // Remove operation
+ {
+ {"half-configured", _("Preparing for removal of %s")},
+ {"half-installed", _("Removing %s")},
+ {"config-files", _("Removed %s")},
+ NULL
+ },
+ // Purge operation
+ {
+ {"config-files", _("Preparing for remove with config %s")},
+ {"not-installed", _("Removed with config %s")},
+ NULL
+ },
+ };
+
+ // the dpkg states that the pkg will run through, the string is
+ // the package, the vector contains the dpkg states that the package
+ // will go through
+ map<string,vector<struct DpkgState> > PackageOps;
+ // the dpkg states that are already done; the string is the package
+ // the int is the state that is already done (e.g. a package that is
+ // going to be install is already in state "half-installed")
+ map<string,int> PackageOpsDone;
+ // init the PackageOps map, go over the list of packages that
+ // that will be [installed|configured|removed|purged] and add
+ // them to the PackageOps map (the dpkg states it goes through)
+ // and the PackageOpsTranslations (human readable strings)
+ for (vector<Item>::iterator I = List.begin(); I != List.end();I++)
+ {
+ string name = (*I).Pkg.Name();
+ PackageOpsDone[name] = 0;
+ for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++)
+ {
+ PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]);
+ Total++;
+ }
+ }
+
+ // this loop is runs once per operation
for (vector<Item>::iterator I = List.begin(); I != List.end();)
{
vector<Item>::iterator J = I;
@@ -367,16 +436,15 @@ bool pkgDPkgPM::Go(int status_fd)
}
}
- // if we got a status_fd argument, we pass it to apt
char status_fd_buf[20];
- if(status_fd > 0)
- {
- Args[n++] = "--status-fd";
- Size += strlen(Args[n-1]);
- snprintf(status_fd_buf,20,"%i",status_fd);
- Args[n++] = status_fd_buf;
- Size += strlen(Args[n-1]);
- }
+ int fd[2];
+ pipe(fd);
+
+ Args[n++] = "--status-fd";
+ Size += strlen(Args[n-1]);
+ snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]);
+ Args[n++] = status_fd_buf;
+ Size += strlen(Args[n-1]);
switch (I->Op)
{
@@ -449,17 +517,17 @@ bool pkgDPkgPM::Go(int status_fd)
it doesn't die but we do! So we must also ignore it */
sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
-
- // Fork dpkg
+
+ // Fork dpkg
pid_t Child;
- if(status_fd > 0)
- Child = ExecFork(status_fd);
- else
- Child = ExecFork();
+ _config->Set("APT::Keep-Fds::",fd[1]);
+ Child = ExecFork();
// This is the child
if (Child == 0)
{
+ close(fd[0]); // close the read end of the pipe
+
if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
_exit(100);
@@ -487,19 +555,112 @@ bool pkgDPkgPM::Go(int status_fd)
_exit(100);
}
+ // clear the Keep-Fd again
+ _config->Clear("APT::Keep-Fds",fd[1]);
+
// Wait for dpkg
int Status = 0;
- while (waitpid(Child,&Status,0) != Child)
- {
- if (errno == EINTR)
+
+ // we read from dpkg here
+ int _dpkgin = fd[0];
+ fcntl(_dpkgin, F_SETFL, O_NONBLOCK);
+ close(fd[1]); // close the write end of the pipe
+
+ // the read buffers for the communication with dpkg
+ char line[1024] = {0,};
+ char buf[2] = {0,0};
+
+ // the result of the waitpid call
+ int res;
+
+ while ((res=waitpid(Child,&Status, WNOHANG)) != Child) {
+ if(res < 0) {
+ // FIXME: move this to a function or something, looks ugly here
+ // error handling, waitpid returned -1
+ if (errno == EINTR)
+ continue;
+ RunScripts("DPkg::Post-Invoke");
+
+ // Restore sig int/quit
+ signal(SIGQUIT,old_SIGQUIT);
+ signal(SIGINT,old_SIGINT);
+ return _error->Errno("waitpid","Couldn't wait for subprocess");
+ }
+
+ // read a single char, make sure that the read can't block
+ // (otherwise we may leave zombies)
+ int len = read(_dpkgin, buf, 1);
+
+ // nothing to read, wait a bit for more
+ if(len <= 0)
+ {
+ usleep(1000);
continue;
- RunScripts("DPkg::Post-Invoke");
+ }
+
+ // sanity check (should never happen)
+ if(strlen(line) >= sizeof(line)-10)
+ {
+ _error->Error("got a overlong line from dpkg: '%s'",line);
+ line[0]=0;
+ }
+ // append to line, check if we got a complete line
+ strcat(line, buf);
+ if(buf[0] != '\n')
+ continue;
+
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "got from dpkg '" << line << "'" << std::endl;
+
+ // pass "error" and "conffile-prompt" messages from dpkg verbatim
+ if((strncmp(line,"error",strlen("error")) == 0) ||
+ (strncmp(line,"conffile-prompt",strlen("conffile-prompt")) == 0))
+ {
+ write(OutStatusFd, line, strlen(line));
+ line[0]=0;
+ continue;
+ }
+ // line contains the dpkg status info now. it has the form:
+ // 'status: <pkg>: <pkg qstate>' (see dpkg(1) for details)
+ char* list[5];
+ TokSplitString(':', line, list, 5);
+ char *pkg = list[1];
+ char *action = list[2];
+ vector<struct DpkgState> &states = PackageOps[pkg];
+ const char *next_action = states[PackageOpsDone[pkg]].state;
+ const char *translation = states[PackageOpsDone[pkg]].str;
+ char s[200];
+ snprintf(s, sizeof(s), translation, pkg);
+ // check if the package moved to the next dpkg state
+ if(next_action && (strcmp(action, next_action) == 0))
+ {
+ // we moved from one dpkg state to a new one, report that
+ PackageOpsDone[pkg]++;
+ Done++;
+ ostringstream status;
+ // build the status str
+ status << "pmstatus:" << pkg
+ << ":" << (Done/float(Total)*100.0)
+ << ":" << s
+ << endl;
+ if(OutStatusFd > 0)
+ write(OutStatusFd, status.str().c_str(), status.str().size());
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ {
+ std::clog << "send to fd: '" << status.str()
+ << "'" << std::endl;
+
+ }
+
+ }
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "(parsed from dpkg) pkg: " << pkg
+ << " action: " << action << endl;
- // Restore sig int/quit
- signal(SIGQUIT,old_SIGQUIT);
- signal(SIGINT,old_SIGINT);
- return _error->Errno("waitpid","Couldn't wait for subprocess");
+ // reset the line buffer
+ line[0]=0;
}
+ close(_dpkgin);
// Restore sig int/quit
signal(SIGQUIT,old_SIGQUIT);
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index b59b9dc93..2ff8a9ac7 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -23,6 +23,13 @@ using std::vector;
class pkgDPkgPM : public pkgPackageManager
{
protected:
+
+ // used for progress reporting
+ struct DpkgState
+ {
+ const char *state; // the dpkg state (e.g. "unpack")
+ const char *str; // the human readable translation of the state
+ };
struct Item
{
@@ -45,7 +52,7 @@ class pkgDPkgPM : public pkgPackageManager
virtual bool Install(PkgIterator Pkg,string File);
virtual bool Configure(PkgIterator Pkg);
virtual bool Remove(PkgIterator Pkg,bool Purge = false);
- virtual bool Go(int status_fd=-1);
+ virtual bool Go(int StatusFd=-1);
virtual void Reset();
public:
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index a08ccd602..155408bb4 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -631,11 +631,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
// ---------------------------------------------------------------------
/* This uses the filenames in FileNames and the information in the
DepCache to perform the installation of packages.*/
-pkgPackageManager::OrderResult pkgPackageManager::DoInstall()
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)
{
OrderResult Res = OrderInstall();
if (Res != Failed)
- if (Go() == false)
+ if (Go(status_fd) == false)
return Failed;
return Res;
}
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 43f2c4ace..f64637d03 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -76,7 +76,7 @@ class pkgPackageManager : protected pkgCache::Namespace
// Main action members
bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs);
- OrderResult DoInstall();
+ OrderResult DoInstall(int statusFd=-1);
bool FixMissing();
pkgPackageManager(pkgDepCache *Cache);
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 316bb7af9..e673e0f5b 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -688,7 +688,7 @@ static bool CheckAuth(pkgAcquire& Fetcher)
if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true)
{
- c2out << "Authentication warning overridden.\n";
+ c2out << _("Authentication warning overridden.\n");
return true;
}
@@ -750,7 +750,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (Cache->BrokenCount() != 0)
{
ShowBroken(c1out,Cache,false);
- return _error->Error("Internal error, InstallPackages was called with broken packages!");
+ return _error->Error(_("Internal error, InstallPackages was called with broken packages!"));
}
if (Cache->DelCount() == 0 && Cache->InstCount() == 0 &&
@@ -765,11 +765,12 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (_config->FindB("APT::Get::Simulate") == true)
{
pkgSimulate PM(Cache);
- pkgPackageManager::OrderResult Res = PM.DoInstall();
+ int status_fd = _config->FindI("APT::Status-Fd",-1);
+ pkgPackageManager::OrderResult Res = PM.DoInstall(status_fd);
if (Res == pkgPackageManager::Failed)
return false;
if (Res != pkgPackageManager::Completed)
- return _error->Error("Internal error, Ordering didn't finish");
+ return _error->Error(_("Internal error, Ordering didn't finish"));
return true;
}
@@ -810,7 +811,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (DebBytes != Cache->DebSize())
{
c0out << DebBytes << ',' << Cache->DebSize() << endl;
- c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl;
+ c0out << _("How odd.. The sizes didn't match, email apt@packages.debian.org") << endl;
}
// Number of bytes
@@ -840,7 +841,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
struct statvfs Buf;
string OutputDir = _config->FindDir("Dir::Cache::Archives");
if (statvfs(OutputDir.c_str(),&Buf) != 0)
- return _error->Errno("statvfs","Couldn't determine free space in %s",
+ return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
OutputDir.c_str());
if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
return _error->Error(_("You don't have enough free space in %s."),
@@ -994,7 +995,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
}
_system->UnLock();
- pkgPackageManager::OrderResult Res = PM->DoInstall();
+ int status_fd = _config->FindI("APT::Status-Fd",-1);
+ pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd);
if (Res == pkgPackageManager::Failed || _error->PendingError() == true)
return false;
if (Res == pkgPackageManager::Completed)
@@ -1743,7 +1745,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (Fix.Resolve() == false)
{
ShowBroken(c1out,Cache,false);
- return _error->Error("Internal error, problem resolver broke stuff");
+ return _error->Error(_("Internal error, problem resolver broke stuff"));
}
}
@@ -1751,7 +1753,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (pkgAllUpgrade(Cache) == false)
{
ShowBroken(c1out,Cache,false);
- return _error->Error("Internal error, problem resolver broke stuff");
+ return _error->Error(_("Internal error, problem resolver broke stuff"));
}
return InstallPackages(Cache,false);
@@ -1922,7 +1924,7 @@ bool DoSource(CommandLine &CmdL)
struct statvfs Buf;
string OutputDir = ".";
if (statvfs(OutputDir.c_str(),&Buf) != 0)
- return _error->Errno("statvfs","Couldn't determine free space in %s",
+ return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
OutputDir.c_str());
if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
return _error->Error(_("You don't have enough free space in %s"),
diff --git a/configure.in b/configure.in
index 7449bb424..7e3aba331 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.6.39ubuntu4")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.40")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.manpages b/debian/apt.manpages
index 7a15245d4..e621e1c49 100644
--- a/debian/apt.manpages
+++ b/debian/apt.manpages
@@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8
doc/fr/apt-cdrom.fr.8
doc/fr/apt-config.fr.8
doc/fr/apt-get.fr.8
+doc/fr/apt-key.fr.8
doc/fr/apt.conf.fr.5
doc/fr/apt_preferences.fr.5
doc/fr/sources.list.fr.5
diff --git a/debian/changelog b/debian/changelog
index 9784b0c92..a01e1491b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,35 +1,17 @@
-apt (0.6.39ubuntu4) breezy; urgency=low
+apt (0.6.40) unstable; urgency=low
- * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
- before...)
+ * Patch from Jordi Mallach to mark some additional strings for translation
+ * Updated Catalan translation from Jordi Mallach
+ * Merge from bubulle@debian.org--2005/apt--main--0:
+ - Update pot and merge with *.po
+ - Updated French translation, including apt-key.fr.8
+ * Restore changelog entries from the 0.6.x series that went to Debian
+ experimental
+ * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0
+ - Provide an interface for progress reporting which can be used by
+ (e.g.) base-config
- -- 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
+ -- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
apt (0.6.39) unstable; urgency=low
@@ -41,14 +23,7 @@ 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@ubuntu.com> 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
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
apt (0.6.38) unstable; urgency=low
@@ -64,26 +39,7 @@ apt (0.6.38) unstable; urgency=low
(closes ubuntu #9935)
-- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
-=======
- -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:51:09 -0700
->>>>>>> MERGE-SOURCE
-apt (0.6.38) unstable; urgency=low
-
- * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
- for the French man pages' failure to build
- * Branch Debian and Ubuntu
- - apt.postinst, apt-key: use the appropriate keyring
- - debian/rules: install all keyrings
- * Add the current Debian archive signing key (4F368D5D) to
- debian-archive.gpg
- * make pinning on the "component" work again (using the section of the
- archive, we don't use per-section Release files anymore with apt-0.6)
- (closes ubuntu #9935)
-
- -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
-
->>>>>>> MERGE-SOURCE
apt (0.6.37) breezy; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-81
@@ -262,6 +218,236 @@ apt (0.6.27) hoary; urgency=low
-- Matt Zimmerman <mdz@canonical.com> Mon, 13 Dec 2004 01:03:11 -0800
+apt (0.6.25) experimental; urgency=low
+
+ * Fix handling of two-part sources for sources.list deb-src entries in
+ the same way that deb entries were fixed
+
+ -- Matt Zimmerman <mdz@debian.org> Wed, 9 Jun 2004 05:29:50 -0700
+
+apt (0.6.24) experimental; urgency=low
+
+ * YnPrompt fixes were inadvertently left out, include them (Closes:
+ #249251)
+
+ -- Matt Zimmerman <mdz@debian.org> Sun, 16 May 2004 14:18:53 -0700
+
+apt (0.6.23) experimental; urgency=low
+
+ * Remove obsolete pkgIterator::TargetVer() (Closes: #230159)
+ * Reverse test in CheckAuth to match new prompt (Closes: #248211)
+
+ -- Matt Zimmerman <mdz@debian.org> Sun, 9 May 2004 21:01:58 -0700
+
+apt (0.6.22) experimental; urgency=low
+
+ * Merge 0.5.25
+ * Make the unauthenticated packages prompt more intuitive (yes to
+ continue, default no), but require --force-yes in addition to
+ --assume-yes in order to override
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 19 Mar 2004 13:55:35 -0800
+
+apt (0.6.21) experimental; urgency=low
+
+ * Merge 0.5.24
+
+ -- Matt Zimmerman <mdz@debian.org> Tue, 16 Mar 2004 22:52:34 -0800
+
+apt (0.6.20) experimental; urgency=low
+
+ * Merge 0.5.23
+
+ -- Matt Zimmerman <mdz@debian.org> Thu, 26 Feb 2004 17:17:02 -0800
+
+apt (0.6.19) experimental; urgency=low
+
+ * Merge 0.5.22
+ * Convert apt-key(8) to docbook XML
+
+ -- Matt Zimmerman <mdz@debian.org> Mon, 9 Feb 2004 15:44:49 -0800
+
+apt (0.6.18) experimental; urgency=low
+
+ * Add new Debian Archive Automatic Signing Key to the default keyring
+ (existing keyrings are not updated; do that yourself)
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 17 Jan 2004 17:04:30 -0800
+
+apt (0.6.17) experimental; urgency=low
+
+ * Merge 0.5.21
+ * Handle more IMS stuff correctly
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 16 Jan 2004 10:54:25 -0800
+
+apt (0.6.16) experimental; urgency=low
+
+ * Fix some cases where the .gpg file could be left in place when it is
+ invalid
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 9 Jan 2004 09:22:15 -0800
+
+apt (0.6.15) experimental; urgency=low
+
+ * s/Debug::Acquire::gpg/&v/
+ * Honor the [vendor] syntax in sources.list again (though it is not
+ presently used for anything)
+ * Don't ship vendors.list(5) since it isn't used yet
+ * Revert change from 0.6.10; it was right in the first place and the
+ problem was apparently something else. Archive = Suite.
+
+ -- Matt Zimmerman <mdz@debian.org> Mon, 5 Jan 2004 17:43:01 -0800
+
+apt (0.6.14) experimental; urgency=low
+
+ * Merge 0.5.20
+
+ -- Matt Zimmerman <mdz@debian.org> Sun, 4 Jan 2004 11:09:21 -0800
+
+apt (0.6.13) experimental; urgency=low
+
+ * Merge 0.5.19
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 3 Jan 2004 16:22:31 -0800
+
+apt (0.6.12) experimental; urgency=low
+
+ * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by
+ the method (as with file: and copy:). Local repositories
+ * Fix warning about dist name mismatch to actually print what it was
+ expecting
+ * Don't expect any particular distribution name for two-part
+ sources.list entries
+ * Merge 0.5.18
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 2 Jan 2004 13:59:00 -0800
+
+apt (0.6.11) experimental; urgency=low
+
+ * Support IMS requests of Release.gpg and Release
+ * This required API changes, bump the libapt-pkg version
+ * Copy local Release files into Dir::State::Lists
+ * Set IndexFile attribute when retrieving Release and Release.gpg so
+ that the appropriate Cache-Control headers are sent
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 2 Jan 2004 10:46:17 -0800
+
+apt (0.6.10) experimental; urgency=low
+
+ * Use "Codename" (woody, sarge, etc.) to supply the value of the
+ "Archive" package file attribute, used to match "release a=" type
+ pins, rather than "Suite" (stable, testing, etc.)
+
+ -- Matt Zimmerman <mdz@debian.org> Thu, 1 Jan 2004 16:56:47 -0800
+
+apt (0.6.9) experimental; urgency=low
+
+ * Another tagfile workaround
+
+ -- Matt Zimmerman <mdz@debian.org> Thu, 1 Jan 2004 13:56:08 -0800
+
+apt (0.6.8) experimental; urgency=low
+
+ * Add a config option and corresponding command line option
+ (--allow-unauthenticated) to apt-get, to make buildd operators happy
+ (Closes: #225648)
+
+ -- Matt Zimmerman <mdz@debian.org> Wed, 31 Dec 2003 08:28:04 -0800
+
+apt (0.6.7) experimental; urgency=low
+
+ * Forgot to revert part of the changes to tagfile in 0.6.4. Hopefully
+ will fix segfaults for some folks.
+
+ -- Matt Zimmerman <mdz@debian.org> Wed, 31 Dec 2003 08:01:28 -0800
+
+apt (0.6.6) experimental; urgency=low
+
+ * Restore the ugly hack I removed from indexRecords::Load which set the
+ pkgTagFile buffer size to (file size)+256. This is concealing a bug,
+ but I can't fix it right now. This should fix the segfaults that
+ folks are seeing with 0.6.[45].
+
+ -- Matt Zimmerman <mdz@debian.org> Mon, 29 Dec 2003 18:11:13 -0800
+
+apt (0.6.5) experimental; urgency=low
+
+ * Move the authentication check into a separate function in apt-get
+ * Fix display of unauthenticated packages when they are in the cache
+ (Closes: #225336)
+
+ -- Matt Zimmerman <mdz@debian.org> Sun, 28 Dec 2003 16:47:57 -0800
+
+apt (0.6.4) experimental; urgency=low
+
+ * Use the top-level Release file in LoadReleaseInfo, rather than looking
+ for the per-section ones (which aren't downloaded anymore). This
+ unbreaks release pinning, including the NotAutomatic bit used by
+ project/experimental
+ * Use FileFd::Size() rather than a separate stat() call in
+ LoadReleaseInfo
+ * Fix pkgTagFile to leave a little extra room at the end of the buffer
+ to append the record separator if it isn't present
+ * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match
+ the Debian archive's dist-level Release files
+
+ -- Matt Zimmerman <mdz@debian.org> Sun, 28 Dec 2003 15:55:55 -0800
+
+apt (0.6.3) experimental; urgency=low
+
+ * Fix MetaIndexURI for flat ("foo/") sources
+
+ -- Matt Zimmerman <mdz@debian.org> Sun, 28 Dec 2003 12:11:56 -0800
+
+apt (0.6.2) experimental; urgency=low
+
+ * Add space between package names when multiple unauthenticated packages
+ are being installed (Closes: #225212)
+ * Provide apt-key with a secret keyring and a trustdb, even though we
+ would never use them, because it blows up if it doesn't have them
+ * Fix typo in apt-key(8) (standard input is '-', not '/')
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 27 Dec 2003 13:01:40 -0800
+
+apt (0.6.1) experimental; urgency=low
+
+ * Merge apt 0.5.17
+ * Rearrange Release file authentication code to be more clear
+ * If Release is present, but Release.gpg is not, don't forget to still
+ queue Packages files
+ * Convert distribution "../project/experimental" to "experimental" for
+ comparison purposes
+ * Make a number of Release file errors into warnings; for now, it is OK
+ not to have a codename, for example. We mostly care about checksums
+ for now
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 26 Dec 2003 15:12:47 -0800
+
+apt (0.6.0) experimental; urgency=low
+
+ * Signature verification support patch ("apt-secure") from Colin Walters
+ <walters@debian.org> and Isaac Jones <ijones@syntaxpolice.org>. This
+ implements:
+ - Release signature verification (Release.gpg)
+ - Packages, Sources md5sum verification against Release
+ - Closes: #203741
+ * Make some modifications to signature verification support:
+ - Release.gpg is always retrieved and verified if present, rather than
+ requiring that sources be configured as secure
+ - Print a hint about installing gnupg if exec(gpgv) fails
+ - Remove obsolete pkgAcqIndexRel
+ - Move vendors.list stuff into a separate module (vendorlist.{h,cc})
+ - If any files about to be retrieved are not authenticated, issue a
+ warning to the user and require confirmation
+ - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords()
+ * Suggests: gnupg
+ * Install a keyring in /usr/share/apt/debian-archive.gpg containing an
+ initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg
+ * Add a new tool, apt-key(8) used to manage the keyring
+
+ -- Matt Zimmerman <mdz@debian.org> Fri, 26 Dec 2003 08:27:19 -0800
+
apt (0.5.32) hoary; urgency=low
* Call setlocale in the methods, so that the messages are properly
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index a09ea0c37..dee0c06ff 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -84,6 +84,13 @@ APT
Force-LoopBreak "false"; // DO NOT turn this on, see the man page
Cache-Limit "4194304";
Default-Release "";
+
+
+ // Write progress messages on this fd (for stuff like base-config)
+ Status-Fd "-1";
+ // Keep the list of FDs open (normally apt closes all fds when it
+ // does a ExecFork)
+ Keep-Fds {};
};
// Options for the downloading routines
@@ -234,6 +241,7 @@ Debug
pkgAcquire "false";
pkgAcquire::Worker "false";
pkgDPkgPM "false";
+ pkgDPkgProgressReporting "false";
pkgOrderList "false";
pkgInitialize "false"; // This one will dump the configuration space
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 24e945b2c..5cb154f66 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,6 +1,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
+#include <apti18n.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -88,7 +89,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
continue;
Args[i++] = Opts->Value.c_str();
if(i >= 395) {
- std::cerr << "E: Argument list from Acquire::gpgv::Options too long. Exiting." << std::endl;
+ std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl;
exit(111);
}
}
@@ -181,27 +182,28 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
waitpid(pid, &status, 0);
if (_config->FindB("Debug::Acquire::gpgv", false))
{
- std::cerr <<"gpgv exited\n";
+ std::cerr << "gpgv exited\n";
}
if (WEXITSTATUS(status) == 0)
{
if (GoodSigners.empty())
- return "Internal error: Good signature, but could not determine key fingerprint?!";
+ return _("Internal error: Good signature, but could not determine key fingerprint?!");
return NULL;
}
else if (WEXITSTATUS(status) == 1)
{
- return "At least one invalid signature was encountered.";
+ return _("At least one invalid signature was encountered.");
}
else if (WEXITSTATUS(status) == 111)
{
- return (string("Could not execute ") + gpgvpath +
- string(" to verify signature (is gnupg installed?)")).c_str();
+ // FIXME String concatenation considered harmful.
+ return (string(_("Could not execute ")) + gpgvpath +
+ string(_(" to verify signature (is gnupg installed?)"))).c_str();
}
else
{
- return "Unknown error executing gpgv";
+ return _("Unknown error executing gpgv");
}
}
@@ -232,14 +234,14 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
{
if (!BadSigners.empty())
{
- errmsg += "The following signatures were invalid:\n";
+ errmsg += _("The following signatures were invalid:\n");
for (vector<string>::iterator I = BadSigners.begin();
I != BadSigners.end(); I++)
errmsg += (*I + "\n");
}
if (!NoPubKeySigners.empty())
{
- errmsg += "The following signatures couldn't be verified because the public key is not available:\n";
+ errmsg += _("The following signatures couldn't be verified because the public key is not available:\n");
for (vector<string>::iterator I = NoPubKeySigners.begin();
I != NoPubKeySigners.end(); I++)
errmsg += (*I + "\n");
@@ -251,16 +253,16 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
// Transfer the modification times
struct stat Buf;
if (stat(Path.c_str(),&Buf) != 0)
- return _error->Errno("stat","Failed to stat %s", Path.c_str());
+ return _error->Errno("stat",_("Failed to stat %s"), Path.c_str());
struct utimbuf TimeBuf;
TimeBuf.actime = Buf.st_atime;
TimeBuf.modtime = Buf.st_mtime;
if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
- return _error->Errno("utime","Failed to set modification time");
+ return _error->Errno("utime",_("Failed to set modification time"));
if (stat(Itm->DestFile.c_str(),&Buf) != 0)
- return _error->Errno("stat","Failed to stat");
+ return _error->Errno("stat",_("Failed to stat"));
// Return a Done response
Res.LastModified = Buf.st_mtime;
@@ -275,7 +277,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
if (_config->FindB("Debug::Acquire::gpgv", false))
{
- std::cerr <<"gpgv suceeded\n";
+ std::cerr << "gpgv succeeded\n";
}
return true;
@@ -284,6 +286,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
int main()
{
+ setlocale(LC_ALL, "");
+
GPGVMethod Mth;
return Mth.Run();
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 3936f3f16..d06c14ce1 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: 2005-05-23 11:34+0200\n"
+"POT-Creation-Date: 2005-06-06 14:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -593,7 +593,7 @@ msgstr ""
#: cmdline/apt-get.cc:544
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
@@ -715,7 +715,7 @@ msgstr ""
#: cmdline/apt-get.cc:865
#, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -1215,7 +1215,7 @@ msgstr ""
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
#, c-format
-msgid "Failed write file %s"
+msgid "Failed to write file %s"
msgstr ""
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1358,7 +1358,7 @@ msgid "Internal error adding a diversion"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:386
@@ -2173,37 +2173,37 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:117
#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:129
#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:150
#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:154
#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:184
#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:188
#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:192
#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:207
@@ -2220,12 +2220,12 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:241
#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:254
#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:260
diff --git a/po/bs.po b/po/bs.po
index d4f9b1f66..806c1204d 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\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"
@@ -147,7 +147,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -535,7 +535,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -606,7 +606,7 @@ msgstr ""
#: cmdline/apt-get.cc:544
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
@@ -684,11 +684,11 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -729,7 +729,7 @@ msgstr "Da, uradi kako kažem!"
#: cmdline/apt-get.cc:865
#, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -743,7 +743,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -752,7 +752,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr ""
@@ -848,7 +848,7 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr ""
@@ -862,27 +862,27 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -890,149 +890,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, 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:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1229,9 +1229,9 @@ msgid "Duplicate conf file %s/%s"
msgstr ""
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Ne mogu ukloniti %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
#, c-format
@@ -1578,7 +1578,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1705,43 +1705,43 @@ msgstr ""
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -2269,31 +2269,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, 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:761
+#: apt-pkg/acquire-item.cc:767
#, 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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 980c2ec42..7fe93910e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
-"PO-Revision-Date: 2005-02-15 18:53+0100\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
+"PO-Revision-Date: 2005-07-19 01:31+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -325,7 +325,6 @@ msgid "Error processing contents %s"
msgstr "S'ha produït un error en processar el fitxer de continguts %s"
#: ftparchive/apt-ftparchive.cc:551
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -378,13 +377,13 @@ msgstr ""
"Gestiona molts estils per a generar-los, des dels completament automàtics\n"
"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n"
"\n"
-"apt-ftparchive genera fitxers Package des d'un arbre de .debs. El\n"
+"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n"
"fitxer Package conté tots els camps de control de cada paquet així com\n"
"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n"
"per a forçar el valor de Prioritat i Secció.\n"
"\n"
-"D'un mode semblant apt-ftparchive genera fitxers Sources des d'un arbre\n"
-"de .dscs. Es pot utilitzar l'opció --source-override per a especificar un\n"
+"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n"
+"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n"
"fitxer de substitucions de src.\n"
"\n"
"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n"
@@ -468,7 +467,7 @@ msgstr "E: Els errors s'apliquen al fitxer "
#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
#, c-format
msgid "Failed to resolve %s"
-msgstr "Falla al resoldre %s"
+msgstr "No s'ha pogut resoldre %s"
#: ftparchive/writer.cc:164
msgid "Tree walking failed"
@@ -477,7 +476,7 @@ msgstr "L'arbre està fallant"
#: ftparchive/writer.cc:189
#, c-format
msgid "Failed to open %s"
-msgstr "Falla a l'obrir %s"
+msgstr "No s'ha pogut obrir %s"
#: ftparchive/writer.cc:246
#, c-format
@@ -487,17 +486,17 @@ msgstr " DeLink %s [%s]\n"
#: ftparchive/writer.cc:254
#, c-format
msgid "Failed to readlink %s"
-msgstr "Falla al llegir l'enllaç %s"
+msgstr "No s'ha pogut llegir l'enllaç %s"
#: ftparchive/writer.cc:258
#, c-format
msgid "Failed to unlink %s"
-msgstr "Falla a l'alliberar %s"
+msgstr "No s'ha pogut alliberar %s"
#: ftparchive/writer.cc:265
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Falla a l'enllaçar %s a %s"
+msgstr "*** No s'ha pogut enllaçar %s a %s"
#: ftparchive/writer.cc:275
#, c-format
@@ -531,7 +530,7 @@ msgstr "Error intern, no s'ha pogut localitzar al membre %s"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falla a l'assignar espai en memòria"
+msgstr "realloc - No s'ha pogut assignar espai en memòria"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
@@ -556,7 +555,7 @@ msgstr "Línia predominant %s línia malformada %lu núm 3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Falla al llegir la línia predominant del fitxer %s"
+msgstr "No s'ha pogut llegir la línia predominant del fitxer %s"
#: ftparchive/multicompress.cc:75
#, c-format
@@ -587,15 +586,15 @@ msgstr "Comprimeix el fil"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Error intern, falla al crear %s"
+msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr "Falla al crear el subprocés IPC"
+msgstr "No s'ha pogut crear el subprocés IPC"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr "Falla a l'executar el compressor "
+msgstr "No s'ha pogut executar el compressor "
#: ftparchive/multicompress.cc:363
msgid "decompressor"
@@ -603,11 +602,11 @@ msgstr "decompressor"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr "Falla l'E/S del subprocés sobre el fitxer"
+msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr "Falla al llegir mentre es càlculava la suma MD5"
+msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
#: ftparchive/multicompress.cc:475
#, c-format
@@ -617,16 +616,16 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Ha fallat el reomenament de %s a %s"
+msgstr "No s'ha pogut canviar el nom de %s a %s"
#: cmdline/apt-get.cc:118
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Error de compilació de l'expressió regular - %s"
+msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
#: cmdline/apt-get.cc:235
msgid "The following packages have unmet dependencies:"
@@ -693,10 +692,10 @@ msgstr "%s (per %s) "
#: cmdline/apt-get.cc:544
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"ATENCIÓ: Els següents paquets essencials seran eliminats\n"
+"AVÍS: Els següents paquets essencials seran eliminats.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
#: cmdline/apt-get.cc:575
@@ -730,7 +729,7 @@ msgstr "S'estan corregint les dependències..."
#: cmdline/apt-get.cc:650
msgid " failed."
-msgstr " falla."
+msgstr " ha fallat."
#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
@@ -758,7 +757,7 @@ msgstr "AVÍS: No es poden autenticar els següents paquets!"
#: cmdline/apt-get.cc:698
msgid "Install these packages without verification [y/N]? "
-msgstr "Voleu instal·lar aquestas paquets sense verificar-los [y/N]? "
+msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
#: cmdline/apt-get.cc:700
msgid "Some packages could not be authenticated"
@@ -766,17 +765,17 @@ msgstr "No s'ha pogut autenticar alguns paquets"
#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
msgid "There are problems and -y was used without --force-yes"
-msgstr "Hi ha problemes i -y fou usat sense --force-yes"
+msgstr "Hi ha problemes i s'ha usat -y sense --force-yes"
#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but remove is disabled."
msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
@@ -817,12 +816,12 @@ msgstr "Sí, fes el que et dic!"
#: cmdline/apt-get.cc:865
#, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Esteu a punt de fer quelcom potencialment nociu\n"
-"Per a continuar escriviu en la frase «%s»\n"
+"Esteu a punt de fer quelcom potencialment nociu.\n"
+"Per a continuar escriviu la frase «%s»\n"
" ?] "
#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
@@ -833,7 +832,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -842,9 +841,9 @@ 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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
-msgstr "Descàrrega completa i en mode de sols descàrrega"
+msgstr "Descàrrega completa i en mode de només descàrrega"
#: cmdline/apt-get.cc:983
msgid ""
@@ -869,14 +868,13 @@ msgstr "S'està avortant la instal·lació."
#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota: s'ha seleccionant %s en comptes de %s\n"
+msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-"S'està ometent a %s, ja està instal·lat i l'actualització no està "
-"establerta.\n"
+"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
#: cmdline/apt-get.cc:1054
#, c-format
@@ -946,7 +944,7 @@ msgstr "Versió seleccionada %s (%s) per a %s\n"
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
@@ -962,21 +960,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -984,7 +982,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -996,7 +994,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1006,109 +1004,109 @@ 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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, 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:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1117,7 +1115,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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1126,32 +1124,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:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Falla al satisfer la dependència %s per a %s: El paquet instal·lat %s és "
-"massa nou"
+"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
+"és massa nou"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Falla al satisfer la dependència %s per a %s: %s"
+msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1379,15 +1377,15 @@ msgstr "DropNode crida a un node que encara està enllaçat"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr "Falla al localitzar l'element diseminat!"
+msgstr "No s'ha trobat l'element diseminat!"
#: apt-inst/filelist.cc:463
msgid "Failed to allocate diversion"
-msgstr "Falla al localitzar la desviació"
+msgstr "No s'ha pogut assignar la desviació"
#: apt-inst/filelist.cc:468
msgid "Internal error in AddDiversion"
-msgstr "Error intern en AddDiversion"
+msgstr "S'ha produït un error intern en AddDiversion"
#: apt-inst/filelist.cc:481
#, c-format
@@ -1406,8 +1404,8 @@ msgstr "Fitxer de conf. duplicat %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
#, c-format
-msgid "Failed write file %s"
-msgstr "Ha fallat l'escriptura del fitxer %s"
+msgid "Failed to write file %s"
+msgstr "No s'ha pogut escriure el fitxer %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
#, c-format
@@ -1445,7 +1443,7 @@ msgstr "El directori %s està sent reemplaçat per un no-directori"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr "Falla al localitzar el node dins la taula"
+msgstr "No s'ha trobat el node dins de la taula"
#: apt-inst/extract.cc:287
msgid "The path is too long"
@@ -1485,7 +1483,7 @@ msgstr "No es pot crear %s"
#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "Falla al comprovar l'estat de %sinfo"
+msgstr "No s'ha pogut fer «stat» de %sinfo"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
@@ -1503,12 +1501,12 @@ msgstr "S'està llegint la llista de paquets"
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "Falla al canviar pel directori de gestió %sinfo"
+msgstr "No s'ha pogut canviar al directori d'admininstració %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 "Error intern obtenint un nom de paquet"
+msgstr "S'ha produït un error intern en obtenir un nom de paquet"
#: apt-inst/deb/dpkgdb.cc:205
msgid "Reading file listing"
@@ -1521,23 +1519,23 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Falla a l'obrir la llista del fitxer '%sinfo/%s'. Si no podeu restaurar "
-"aquest fitxer llavores marqueu-lo amb empty i torneu a instal·lar "
-"immediatament la mateixa versió del paquet!"
+"No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu restaurar "
+"aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa "
+"versió del paquet!"
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Falla al llegir la llista del fitxer %sinfo/%s"
+msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
-msgstr "Error intern obtinguen un node"
+msgstr "S'ha produït un error en obtenir un node"
#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Falla a l'obrir el fitxer de desviació %sdiversions"
+msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
@@ -1551,7 +1549,7 @@ msgstr "Línia no vàlida en el fitxer de desviació: %s"
#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
-msgstr "Error intern afegint una desviació"
+msgstr "S'ha produït un error intern en afegir una desviació"
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
@@ -1564,7 +1562,7 @@ msgstr "S'està llegint la llista de fitxers"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Falla al cercar un paquet: Capçalera, desplaçament %lu"
+msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
@@ -1574,12 +1572,12 @@ msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "Error analitzant la suma MD5. Desplaçament %lu"
+msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu"
#: 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 "Aquest no és un arxiu DEB vàlid, falta el membre '%s'"
+msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
#: apt-inst/deb/debfile.cc:52
#, c-format
@@ -1593,15 +1591,15 @@ msgstr "No s'ha pogut canviar a %s"
#: apt-inst/deb/debfile.cc:138
msgid "Internal error, could not locate member"
-msgstr "Error intern, no s'ha pogut localitzar al membre"
+msgstr "S'ha produït un error intern, no s'ha trobat el membre"
#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
-msgstr "S'ha fallat en localitzar un fitxer de control vàlid"
+msgstr "No s'ha trobat un fitxer de control vàlid"
#: apt-inst/deb/debfile.cc:256
msgid "Unparsable control file"
-msgstr "Fitxer de control incoherent"
+msgstr "El fitxer de control no es pot analitzar"
#: methods/cdrom.cc:113
#, c-format
@@ -1635,7 +1633,7 @@ msgstr "L'estat ha fallat"
#: methods/copy.cc:79 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "Falla a l'establir la modificació de temps"
+msgstr "No s'ha pogut establir el temps de modificació"
#: methods/file.cc:42
msgid "Invalid URI, local URIS must not start with //"
@@ -1762,7 +1760,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1889,43 +1887,43 @@ msgstr "Aquest servidor http té el suport d'abast trencat"
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Error intern"
@@ -2070,7 +2068,7 @@ msgstr "No es pot canviar a %s"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
-msgstr "Falla al examinar el cdrom"
+msgstr "No s'ha pogut fer «stat» del cdrom"
#: apt-pkg/contrib/fileutl.cc:80
#, c-format
@@ -2100,7 +2098,7 @@ msgstr "Esperava %s però no hi era"
#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "Sub-procés %s ha rebut una falla de segmentació."
+msgstr "Sub-procés %s ha rebut una violació de segment."
#: apt-pkg/contrib/fileutl.cc:372
#, c-format
@@ -2465,13 +2463,13 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "falla de renomenat, %s (%s -> %s)."
+msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2481,7 +2479,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2490,7 +2488,7 @@ msgstr ""
"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
"significar que haureu d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2498,7 +2496,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Mida diferent"
@@ -2603,6 +2601,63 @@ msgstr ""
"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
"coincidents\n"
+#~ msgid "Authentication warning overridden.\n"
+#~ msgstr "S'ha descartat l'avís d'autenticació.\n"
+
+#~ msgid "Internal error, InstallPackages was called with broken packages!"
+#~ msgstr ""
+#~ "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
+#~ "trencats!"
+
+#~ msgid "Internal error, Ordering didn't finish"
+#~ msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
+
+#~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#~ msgstr ""
+#~ "Què estrany... les mides no coincideixen, informeu a apt@packages.debian."
+#~ "org"
+
+#~ msgid "Couldn't determine free space in %s"
+#~ msgstr "No s'ha pogut determinar l'espai lliure en %s"
+
+#~ msgid "Internal error, problem resolver broke stuff"
+#~ msgstr ""
+#~ "S'ha produït un error intern, el solucionador de problemes ha trencat "
+#~ "coses"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
+#~ "sortint."
+
+#~ msgid ""
+#~ "Internal error: Good signature, but could not determine key fingerprint?!"
+#~ msgstr ""
+#~ "Error intern: La signatura és correcta, però no s'ha pogut determinar "
+#~ "l'emprempta digital de la clau!"
+
+#~ msgid "At least one invalid signature was encountered."
+#~ msgstr "S'ha trobat almenys una signatura invàlida."
+
+#~ msgid "Could not execute "
+#~ msgstr "No s'ha pogut executar "
+
+#~ msgid " to verify signature (is gnupg installed?)"
+#~ msgstr " per a verificar la signatura (està instal·lat el gnupg?)"
+
+#~ msgid "Unknown error executing gpgv"
+#~ msgstr "S'ha produït un error desconegut en executar el gpgv"
+
+#~ msgid "The following signatures were invalid:\n"
+#~ msgstr "Les següents signatures són invàlides:\n"
+
+#~ msgid ""
+#~ "The following signatures couldn't be verified because the public key is "
+#~ "not available:\n"
+#~ msgstr ""
+#~ "Les següents signatures no s'han pogut verificar perquè la clau pública "
+#~ "no està disponible:\n"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s"
diff --git a/po/cs.po b/po/cs.po
index 7dceb8c07..28f683d1a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-11 16:14+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <provoz@debian.cz>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -617,7 +617,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -686,8 +686,9 @@ msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
@@ -766,11 +767,11 @@ msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
@@ -809,9 +810,9 @@ msgid "Yes, do as I say!"
msgstr "Ano, udělej to tak, jak říkám!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -827,7 +828,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -836,7 +837,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -937,7 +938,7 @@ msgstr "Vybraná verze %s (%s) pro %s\n"
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
@@ -953,21 +954,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -975,7 +976,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -986,7 +987,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -996,114 +997,114 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Následujcící extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci..."
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Stažení některých archívů selhalo."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1112,31 +1113,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1383,8 +1384,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Duplicitní konfigurační soubor %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Selhal zápis do souboru %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1737,7 +1738,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1864,43 +1865,43 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů"
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2436,11 +2437,11 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2449,7 +2450,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2458,14 +2459,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:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
diff --git a/po/cy.po b/po/cy.po
index d8360fc3f..219125086 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: 2004-04-29 21:56-0700\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\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"
@@ -14,145 +14,163 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:133
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
-#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613
-#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355
-#: cmdline/apt-cache.cc:1506
+#: 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 "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:230
-msgid "Total Package Names : "
+#: cmdline/apt-cache.cc:232
+#, fuzzy
+msgid "Total package names : "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:270
-msgid " Normal Packages: "
+#: cmdline/apt-cache.cc:272
+#, fuzzy
+msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:271
-msgid " Pure Virtual Packages: "
+#: cmdline/apt-cache.cc:273
+#, fuzzy
+msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:272
-msgid " Single Virtual Packages: "
+#: cmdline/apt-cache.cc:274
+#, fuzzy
+msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:273
-msgid " Mixed Virtual Packages: "
+#: cmdline/apt-cache.cc:275
+#, fuzzy
+msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:276
-msgid "Total Distinct Versions: "
+#: cmdline/apt-cache.cc:278
+#, fuzzy
+msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:278
-msgid "Total Dependencies: "
+#: cmdline/apt-cache.cc:280
+#, fuzzy
+msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:281
-msgid "Total Ver/File relations: "
+#: cmdline/apt-cache.cc:283
+#, fuzzy
+msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:283
-msgid "Total Provides Mappings: "
+#: cmdline/apt-cache.cc:285
+#, fuzzy
+msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:295
-msgid "Total Globbed Strings: "
+#: cmdline/apt-cache.cc:297
+#, fuzzy
+msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:309
-msgid "Total Dependency Version space: "
+#: cmdline/apt-cache.cc:311
+#, fuzzy
+msgid "Total dependency version space: "
msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-#: cmdline/apt-cache.cc:314
-msgid "Total Slack space: "
+#: cmdline/apt-cache.cc:316
+#, fuzzy
+msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:322
-msgid "Total Space Accounted for: "
+#: cmdline/apt-cache.cc:324
+#, fuzzy
+msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
-#: cmdline/apt-cache.cc:1229
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr "Rhaid i chi ddarparu un patrwm yn union"
-#: cmdline/apt-cache.cc:1383
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
-#: cmdline/apt-cache.cc:1460
-msgid "Package Files:"
+#: cmdline/apt-cache.cc:1462
+#, fuzzy
+msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
-#: cmdline/apt-cache.cc:1468
+#: 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:1480
-msgid "Pinned Packages:"
+#: cmdline/apt-cache.cc:1482
+#, fuzzy
+msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(heb ganfod)"
#. Installed version
-#: cmdline/apt-cache.cc:1513
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(dim)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1530
-msgid " Package Pin: "
+#: cmdline/apt-cache.cc:1532
+#, fuzzy
+msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1539
-msgid " Version Table:"
+#: cmdline/apt-cache.cc:1541
+#, fuzzy
+msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2299 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1658
+#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -187,7 +205,7 @@ msgid ""
" -q Disable progress indicator.\n"
" -i Show only important deps for the unmet command.\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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 ""
"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
@@ -231,6 +249,7 @@ msgid "Arguments not in pairs"
msgstr "Nid yw ymresymiadau mewn parau"
#: cmdline/apt-config.cc:76
+#, fuzzy
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -243,8 +262,9 @@ msgid ""
"Options:\n"
" -h This help text.\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"
"\n"
"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
"\n"
@@ -264,6 +284,7 @@ msgstr "Nid yw %s yn becyn DEB dilys."
# FIXME: "debian"
#: cmdline/apt-extracttemplates.cc:232
+#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -274,7 +295,7 @@ msgid ""
" -h This help text\n"
" -t Set the temp dir\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
"\n"
@@ -303,8 +324,8 @@ msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
-#, c-format
-msgid "Error Processing directory %s"
+#, fuzzy, c-format
+msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
#: ftparchive/apt-ftparchive.cc:250
@@ -316,12 +337,13 @@ msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
#: ftparchive/apt-ftparchive.cc:397
-#, c-format
-msgid "Error Processing Contents %s"
+#, fuzzy, c-format
+msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
#: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -360,7 +382,7 @@ msgid ""
" --no-delink Enable delinking debug mode\n"
" --contents Control contents file generation\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option"
+" -o=? Set an arbitrary configuration option"
msgstr ""
"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
@@ -372,8 +394,7 @@ msgstr ""
"\n"
"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
-"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a "
-"dpkg-scansources.\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
"\n"
"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
@@ -502,27 +523,32 @@ msgstr "*** Methwyd cysylltu %s at %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
-#: ftparchive/writer.cc:372
+#: ftparchive/writer.cc:378
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:380 ftparchive/writer.cc:589
+#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:423 ftparchive/writer.cc:671
+#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Methwyd neilltuo cof"
@@ -552,8 +578,8 @@ msgid "Failed to read the override file %s"
msgstr "Methwydd darllen y ffeil dargyfeirio %s"
#: ftparchive/multicompress.cc:75
-#, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
msgstr "Dull Cywasgu Anhysbys '%s'"
#: ftparchive/multicompress.cc:105
@@ -574,12 +600,13 @@ msgid "Failed to fork"
msgstr "Methodd fork()"
#: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+#, fuzzy
+msgid "Compress child"
msgstr "Plentyn Cywasgu"
#: ftparchive/multicompress.cc:238
-#, c-format
-msgid "Internal Error, Failed to create %s"
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
msgstr "Gwall Mewnol, Methwyd creu %s"
#: ftparchive/multicompress.cc:289
@@ -616,7 +643,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -664,15 +691,18 @@ msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
#: cmdline/apt-get.cc:421
-msgid "The following packages have been kept back"
+#, fuzzy
+msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
#: cmdline/apt-get.cc:442
-msgid "The following packages will be upgraded"
+#, fuzzy
+msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
#: cmdline/apt-get.cc:463
-msgid "The following packages will be DOWNGRADED"
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
#: cmdline/apt-get.cc:483
@@ -685,8 +715,9 @@ msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
@@ -747,67 +778,74 @@ msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
#: cmdline/apt-get.cc:687
-msgid "WARNING: The following packages cannot be securely authenticated!"
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
#: cmdline/apt-get.cc:698
-msgid "Abort? [Y/n] "
-msgstr "Erthylu? [I/n] "
+msgid "Install these packages without verification [y/N]? "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:755
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+
+#: cmdline/apt-get.cc:762
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: cmdline/apt-get.cc:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: cmdline/apt-get.cc:811
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:829
#, c-format
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:839
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: cmdline/apt-get.cc:848
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
-#: cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:858
-#, c-format
+#: cmdline/apt-get.cc:865
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -815,28 +853,29 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:879
-msgid "Do you want to continue? [Y/n] "
+#: cmdline/apt-get.cc:886
+#, fuzzy
+msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -844,103 +883,103 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:989
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:993
+#, fuzzy
+msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: cmdline/apt-get.cc:1061
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: cmdline/apt-get.cc:1073
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:1078
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:1083
-#, c-format
+#: cmdline/apt-get.cc:1087
+#, fuzzy, c-format
msgid ""
-"Package %s has no available version, but exists in the database.\n"
-"This typically means that the package was mentioned in a dependency and\n"
-"never uploaded, has been obsoleted or is not available with the contents\n"
-"of sources.list\n"
+"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 ""
"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:1103
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:1161
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: cmdline/apt-get.cc:1169
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:1279
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1292
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1344
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -948,26 +987,27 @@ msgstr ""
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: cmdline/apt-get.cc:1363
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1372
+#, fuzzy
+msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1476
+#: cmdline/apt-get.cc:1494
#, 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:1506
+#: cmdline/apt-get.cc:1524
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:1509
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -976,7 +1016,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1539
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"
@@ -989,7 +1029,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1547
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"
@@ -998,147 +1038,153 @@ 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:1534
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1563
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1630
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1650
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1673
+#, fuzzy
+msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1658
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1831
+#: cmdline/apt-get.cc:1854
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:1858 cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:1905
+#: cmdline/apt-get.cc:1928
#, 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:1910
+#: cmdline/apt-get.cc:1933
#, 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:1913
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:1919
-#, c-format
-msgid "Fetch Source %s\n"
+#: cmdline/apt-get.cc:1942
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2001
#, 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:1990
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2065
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"
+msgstr ""
+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2070
+#: cmdline/apt-get.cc:2093
#, 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:2090
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2142
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
+"s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
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"
+"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:2229
+#: cmdline/apt-get.cc:2252
#, 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"
+msgstr ""
+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2304
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2327
+#, fuzzy
+msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2345
+#: cmdline/apt-get.cc:2368
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1174,7 +1220,7 @@ msgid ""
" -b Build the source package after fetching it\n"
" -V Show verbose version numbers\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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"
@@ -1242,13 +1288,14 @@ msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
+#, c-format
msgid " [Working]"
msgstr " [Gweithio]"
#: cmdline/acqprogress.cc:271
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
@@ -1261,6 +1308,7 @@ msgid "Unknown package record!"
msgstr "Cofnod pecyn anhysbys!"
#: cmdline/apt-sortpkgs.cc:150
+#, fuzzy
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -1271,7 +1319,7 @@ msgid ""
" -h This help text\n"
" -s Use source file sorting\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
"\n"
@@ -1313,26 +1361,28 @@ msgstr ""
"eto."
#: dselect/update:30
-msgid "Merging Available information"
+#, fuzzy
+msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-inst/contrib/extracttar.cc:115
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Methwyd creu pibau"
-#: apt-inst/contrib/extracttar.cc:140
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Methwyd gweithredu gzip"
-#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Archif llygredig"
-#: apt-inst/contrib/extracttar.cc:192
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:195
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:295
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
@@ -1370,7 +1420,8 @@ msgid "Failed to allocate diversion"
msgstr "Methwyd neilltuo dargyfeiriad"
#: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+#, fuzzy
+msgid "Internal error in AddDiversion"
msgstr "Gwall Mewnol yn AddDiversion"
#: apt-inst/filelist.cc:481
@@ -1390,8 +1441,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Ffeil cyfluniad dyblyg %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Methwyd ysgrifennu ffeil %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1426,7 +1477,8 @@ msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+msgstr ""
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
@@ -1481,7 +1533,8 @@ msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
#: 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"
+#, fuzzy
+msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
#: apt-inst/deb/dpkgdb.cc:180
@@ -1492,11 +1545,13 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
# FIXME
#: 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"
+#, fuzzy
+msgid "Internal error getting a package name"
msgstr "Gwall mewnol wrth gyrchu enw pecyn"
#: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+#, fuzzy
+msgid "Reading file listing"
msgstr "Yn Darllen Rhestr Ffeiliau"
#: apt-inst/deb/dpkgdb.cc:216
@@ -1516,7 +1571,8 @@ msgid "Failed reading the list file %sinfo/%s"
msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+#, fuzzy
+msgid "Internal error getting a node"
msgstr "Gwall Mewnol wrth gael Nôd"
# FIXME: literal
@@ -1536,20 +1592,23 @@ msgid "Invalid line in the diversion file: %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
#: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+#, fuzzy
+msgid "Internal error adding a diversion"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+#, fuzzy
+msgid "The pkg cache must be initialized first"
msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+#, fuzzy
+msgid "Reading file list"
msgstr "Yn Darllen Rhestr Ffeiliau"
#: apt-inst/deb/dpkgdb.cc:443
-#, c-format
-msgid "Failed to find a Package: Header, offset %lu"
+#, fuzzy, c-format
+msgid "Failed to find a Package: header, offset %lu"
msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
#: apt-inst/deb/dpkgdb.cc:465
@@ -1562,31 +1621,33 @@ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
-#: apt-inst/deb/debfile.cc:55
+#: 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 "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#: apt-inst/deb/debfile.cc:52
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Methwyd newid i %s"
-#: apt-inst/deb/debfile.cc:125
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:138
+#, fuzzy
+msgid "Internal error, could not locate member"
msgstr "Gwall Methwyd, methwyd lleoli aelod"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Methwyd lleoli ffeil rheoli dilys"
-#: apt-inst/deb/debfile.cc:243
-msgid "Unparsible control file"
+#: apt-inst/deb/debfile.cc:256
+#, fuzzy
+msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
#: methods/cdrom.cc:113
@@ -1595,24 +1656,26 @@ msgid "Unable to read the cdrom database %s"
msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
#: methods/cdrom.cc:122
+#, fuzzy
msgid ""
-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
msgstr ""
-"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio "
-"apt-get update i ychwanegu CDau newydd."
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."
#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+#, fuzzy
+msgid "Wrong CD-ROM"
msgstr "CD Anghywir"
#: methods/cdrom.cc:163
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei "
-"ddefnyddio."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
@@ -1642,8 +1705,8 @@ msgid "Unable to determine the local name"
msgstr "Ni ellir darganfod yr enw lleol"
#: methods/ftp.cc:204 methods/ftp.cc:232
-#, c-format
-msgid "Server refused our connection and said: %s"
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
#: methods/ftp.cc:210
@@ -1661,8 +1724,8 @@ msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae "
-"Acquire::ftp::ProxyLogin yn wag.)"
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
+"ProxyLogin yn wag.)"
# FIXME
#: methods/ftp.cc:265
@@ -1683,7 +1746,7 @@ msgstr "Goramser cysylltu"
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "Gwall darllen"
@@ -1695,9 +1758,9 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "Gwall Ysgrifennu"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"
+msgstr "Gwall ysgrifennu"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
@@ -1708,7 +1771,8 @@ msgid "Could not connect data socket, connection timed out"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
#: methods/ftp.cc:704
-msgid "Could not connect passive socket"
+#, fuzzy
+msgid "Could not connect passive socket."
msgstr "Methwyd cysylltu soced goddefol"
# FIXME
@@ -1750,7 +1814,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1774,7 +1838,7 @@ msgid "Query"
msgstr "Ymholiad"
# FIXME
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
@@ -1845,79 +1909,89 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:340
+#: methods/http.cc:344
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:486
+#: methods/http.cc:490
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:494
+#: methods/http.cc:498
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:513 methods/http.cc:520
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:517 methods/http.cc:524
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:549
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:553
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:564
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:568
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:566
-msgid "This http server has broken range support"
+#: methods/http.cc:570
+#, fuzzy
+msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:590
+#: methods/http.cc:594
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:733
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:738
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:761
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:789
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:814
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:828
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:836
+#, 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:830
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1061
-msgid "Bad header Data"
+#: methods/http.cc:1069
+#, fuzzy
+msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1078
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1169
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Gwall mewnol"
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
@@ -1954,8 +2028,8 @@ msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
# FIXME
#: apt-pkg/contrib/configuration.cc:586
-#, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
#: apt-pkg/contrib/configuration.cc:603
@@ -1966,7 +2040,8 @@ msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
#: apt-pkg/contrib/configuration.cc:643
#, 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"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
#: apt-pkg/contrib/configuration.cc:650
#, c-format
@@ -2051,7 +2126,7 @@ msgstr "Gweithred annilys %s"
msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
@@ -2080,56 +2155,52 @@ msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:358
-#, c-format
-msgid "Waited, for %s but it wasn't there"
+#: apt-pkg/contrib/fileutl.cc:359
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:474
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
-
# FIXME
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:504
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
@@ -2147,8 +2218,8 @@ msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
# FIXME: capitalisation?
#: apt-pkg/pkgcache.cc:142
-#, c-format
-msgid "This APT does not support the Versioning System '%s'"
+#, fuzzy, c-format
+msgid "This APT does not support the versioning system '%s'"
msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
#: apt-pkg/pkgcache.cc:147
@@ -2204,15 +2275,18 @@ msgid "extra"
msgstr "ychwanegol"
#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+#, fuzzy
+msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
#: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+#, fuzzy
+msgid "Candidate versions"
msgstr "Fersiynau Posib"
#: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+#, fuzzy
+msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
# FIXME: number?
@@ -2242,14 +2316,15 @@ msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
#: apt-pkg/sourcelist.cc:98
-#, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
#: apt-pkg/sourcelist.cc:156
#, c-format
@@ -2267,10 +2342,15 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#, fuzzy, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
# FIXME: %s may have an arbirrary length
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2280,33 +2360,34 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"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."
+"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:37
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:238
+#: 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 ""
-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei "
-"gyfer."
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod "
-"wedi ei achosi gan pecynnau wedi eu dal."
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+msgstr ""
+"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
#: apt-pkg/acquire.cc:61
#, c-format
@@ -2334,7 +2415,8 @@ msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
#: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable system type"
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
#: apt-pkg/clean.cc:61
@@ -2375,44 +2457,44 @@ msgid "Cache has an incompatible versioning system"
msgstr "Mae can y storfa system fersiwn anghyfaddas"
#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
-#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
-#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
-#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
-#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
-#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei "
-" drin."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
@@ -2420,16 +2502,17 @@ msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
#: apt-pkg/pkgcachegen.cc:241
-#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
@@ -2455,12 +2538,12 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:205 apt-pkg/acquire-item.cc:817
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
# FIXME: case
-#: apt-pkg/acquire-item.cc:654
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2469,7 +2552,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:689
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2478,14 +2561,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:720
+#: apt-pkg/acquire-item.cc:803
#, 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:807
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2494,10 +2577,104 @@ msgstr "Camgyfatebiaeth maint"
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Ni Chanfuwyd Y Ffeil"
+#: apt-pkg/cdrom.cc:504
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
+msgid "Identifying.. "
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+#: apt-pkg/cdrom.cc:538
+#, c-format
+msgid "Stored label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:558
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:576
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:580
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:588
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:606
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:644
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:701
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:717
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:721
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/cdrom.cc:745
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:788
+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 ""
+
+#~ msgid "Abort? [Y/n] "
+#~ msgstr "Erthylu? [I/n] "
+
+#~ msgid "Write Error"
+#~ msgstr "Gwall Ysgrifennu"
+
+#~ msgid "File Not Found"
+#~ msgstr "Ni Chanfuwyd Y Ffeil"
diff --git a/po/da.po b/po/da.po
index 7d8f3508f..44cf0337a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-06-23 10:46+0200\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -623,7 +623,7 @@ msgstr "Kunne ikke omdbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
@@ -692,8 +692,9 @@ msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n"
@@ -772,11 +773,11 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
@@ -815,9 +816,9 @@ msgid "Yes, do as I say!"
msgstr "Ja, gr som jeg siger!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -833,7 +834,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -842,7 +843,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -945,7 +946,7 @@ msgstr "Valgte version %s (%s) af %s\n"
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
@@ -961,21 +962,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -983,7 +984,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -994,7 +995,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1003,105 +1004,105 @@ 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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1109,7 +1110,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1118,32 +1119,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1396,8 +1397,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dobbelt opstningsfil %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Kunne ikke skrive filen %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1544,7 +1545,7 @@ msgstr "Intern fejl under tilfjelse af omrokering"
#: apt-inst/deb/dpkgdb.cc:383
#, fuzzy
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
msgstr "pkg-mellemlageret skal initialiseres frst"
#: apt-inst/deb/dpkgdb.cc:386
@@ -1752,7 +1753,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1880,43 +1881,43 @@ msgstr ""
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Intern fejl"
@@ -2373,37 +2374,37 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
#: apt-pkg/pkgcachegen.cc:117
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
#, fuzzy, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
#, fuzzy, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
#, fuzzy, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
@@ -2422,12 +2423,12 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:241
#, fuzzy, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, fuzzy, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
#: apt-pkg/pkgcachegen.cc:260
diff --git a/po/de.po b/po/de.po
index 3cb0cc23e..e053fee1e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-06-15 18:22+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -376,20 +376,27 @@ msgstr ""
" generate config [gruppen]\n"
" clean config\n"
"\n"
-"apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt viele\n"
+"apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt "
+"viele\n"
"verschiedene Arten der Generierung, von vollautomatisch bis hin zu den\n"
"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n"
"\n"
-"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die Package-\n"
-"Datei enthält die Inhalt aller Kontrollfelder aus jedem Paket sowie einen MD5-\n"
-"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte für\n"
+"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die "
+"Package-\n"
+"Datei enthält die Inhalt aller Kontrollfelder aus jedem Paket sowie einen "
+"MD5-\n"
+"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte "
+"für\n"
"Priorität und Sektion zu erzwingen.\n"
"\n"
-"Auf ganz ähnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem Baum\n"
-"von .dscs. Die Option --source-override kann benutzt werden, um eine Override-\n"
+"Auf ganz ähnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem "
+"Baum\n"
+"von .dscs. Die Option --source-override kann benutzt werden, um eine "
+"Override-\n"
"Datei für Quellen anzugeben.\n"
"\n"
-"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes aufgerufen\n"
+"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes "
+"aufgerufen\n"
"werden. BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n"
"overridefile sollte die Override-Flags enthalten. Pfadpräfix wird, so\n"
"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n"
@@ -624,7 +631,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -693,8 +700,9 @@ msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
@@ -775,11 +783,11 @@ msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -818,9 +826,9 @@ msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -836,7 +844,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
@@ -845,7 +853,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
@@ -949,7 +957,7 @@ msgstr "Gewählte Version %s (%s) für %s\n"
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« nimmt keine Argumente"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
@@ -965,23 +973,23 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren:"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -989,7 +997,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:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1001,7 +1009,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1012,110 +1020,110 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, 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:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1124,7 +1132,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1133,32 +1141,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1415,8 +1423,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Doppelte Konfigurationsdatei %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Konnte nicht in Datei %s schreiben"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1775,7 +1783,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1903,45 +1911,45 @@ msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:832
+#: methods/http.cc:836
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:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2488,11 +2496,11 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2501,7 +2509,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2510,14 +2518,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:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
diff --git a/po/el.po b/po/el.po
index f331c279d..4a0cfe84d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,14 +16,15 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
-"PO-Revision-Date: 2005-02-20 15:01EEST\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
+"PO-Revision-Date: 2005-07-14 14:25EEST\n"
"Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
"org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"org>\n"
"X-Generator: KBabel 1.9.1\n"
#: cmdline/apt-cache.cc:135
@@ -160,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -336,7 +337,6 @@ msgid "Error processing contents %s"
msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
#: ftparchive/apt-ftparchive.cc:551
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -395,8 +395,7 @@ msgstr ""
"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n"
"(Τομέας).\n"
"\n"
-"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από "
-"μια\n"
+"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n"
"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n"
"για παράκαμψη των αρχείων πηγών src.\n"
"\n"
@@ -638,7 +637,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -707,8 +706,9 @@ msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
@@ -790,11 +790,11 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -833,9 +833,9 @@ msgid "Yes, do as I say!"
msgstr "Ναι, κανε ότι λέω!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -851,7 +851,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -860,7 +860,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -966,7 +966,7 @@ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
@@ -982,21 +982,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1004,7 +1004,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1016,7 +1016,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1026,108 +1026,108 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1135,7 +1135,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1144,32 +1144,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1422,8 +1422,8 @@ 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 write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Αποτυχία εγγραφής στο αρχείο %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1569,6 +1569,7 @@ msgid "Internal error adding a diversion"
msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης"
#: apt-inst/deb/dpkgdb.cc:383
+#, fuzzy
msgid "The pkg cache must be initialized first"
msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα"
@@ -1776,7 +1777,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1903,44 +1904,44 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2404,37 +2405,37 @@ msgid "Cache has an incompatible versioning system"
msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
#: apt-pkg/pkgcachegen.cc:117
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
@@ -2454,12 +2455,12 @@ msgstr ""
"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
#: apt-pkg/pkgcachegen.cc:241
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
@@ -2486,11 +2487,11 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2499,7 +2500,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2508,7 +2509,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2516,7 +2517,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
diff --git a/po/en_GB.po b/po/en_GB.po
index e374f13d2..574a296d3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: en_GB <en@li.org>\n"
@@ -147,7 +147,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -632,7 +632,7 @@ msgstr ""
#: cmdline/apt-get.cc:544
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
@@ -709,11 +709,11 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -752,9 +752,9 @@ msgid "Yes, do as I say!"
msgstr ""
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -770,7 +770,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -779,7 +779,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr ""
@@ -875,7 +875,7 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr ""
@@ -889,21 +889,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -911,7 +911,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -919,149 +919,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, 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:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1261,9 +1261,9 @@ msgid "Duplicate conf file %s/%s"
msgstr ""
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Could not resolve ‘%s’"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
#, c-format
@@ -1611,7 +1611,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1738,43 +1738,43 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr ""
@@ -2301,31 +2301,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, 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:761
+#: apt-pkg/acquire-item.cc:767
#, 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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 297aa64a3..e046e15c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.24\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-08 20:36+0100\n"
"Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -631,7 +631,7 @@ msgstr "Fall el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
@@ -700,8 +700,9 @@ msgid "%s (due to %s) "
msgstr "%s (por %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales\n"
@@ -780,11 +781,11 @@ msgstr "Hay problemas y se utiliz -y sin --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -824,9 +825,9 @@ msgid "Yes, do as I say!"
msgstr "S, haga lo que le digo!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -842,7 +843,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -851,7 +852,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
@@ -952,7 +953,7 @@ msgstr "Versin seleccionada %s (%s) para %s\n"
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
@@ -968,21 +969,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -990,7 +991,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1002,7 +1003,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1012,107 +1013,107 @@ msgstr ""
"paquete simplemente no sea instalable y debera de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, 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:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1121,7 +1122,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1130,32 +1131,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1412,8 +1413,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Archivo de configuracin duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Fall el cierre del archivo %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1767,7 +1768,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1894,43 +1895,43 @@ msgstr "ste servidor de http tiene el soporte de alcance roto"
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Error interno"
@@ -2479,11 +2480,11 @@ msgstr "Error de E/S guardando cach fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2493,7 +2494,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2502,7 +2503,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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2510,7 +2511,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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "El tamao difiere"
diff --git a/po/eu.po b/po/eu.po
index fec23bfe5..590e916f8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-04-20 20:05+0200\n"
"Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -620,7 +620,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio-errorea - %s"
@@ -689,8 +689,9 @@ msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
@@ -769,11 +770,11 @@ msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
@@ -812,9 +813,9 @@ msgid "Yes, do as I say!"
msgstr "Bai, egin esandakoa!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -830,7 +831,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -839,7 +840,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -940,7 +941,7 @@ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda-direktorioa blokeatu"
@@ -956,21 +957,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -978,7 +979,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -990,7 +991,7 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -999,107 +1000,107 @@ 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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1107,7 +1108,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1116,32 +1117,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1391,8 +1392,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Ezin izan da %s fitxategian idatzi"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1749,7 +1750,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1877,43 +1878,43 @@ msgstr "http zerbitzariak barruti onarpena apurturik du"
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Barne-errorea"
diff --git a/po/fi.po b/po/fi.po
index 3436485a9..04cc6473c 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-15 14:09+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -623,7 +623,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -692,8 +692,9 @@ msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n"
@@ -772,11 +773,11 @@ msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -816,9 +817,9 @@ msgid "Yes, do as I say!"
msgstr "Kyllä, tee kuten käsketään!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -834,7 +835,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -843,7 +844,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -944,7 +945,7 @@ msgstr "Valittiin versio %s (%s) paketille %s\n"
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
@@ -960,21 +961,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -982,7 +983,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -993,7 +994,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1003,106 +1004,106 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1110,7 +1111,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1119,32 +1120,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1394,8 +1395,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Asetustiedoston kaksoiskappale %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1748,7 +1749,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1875,43 +1876,43 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki"
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2445,11 +2446,11 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2458,7 +2459,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2467,7 +2468,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2475,7 +2476,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Koko ei täsmää"
diff --git a/po/fr.po b/po/fr.po
index d317a2a80..26323dd75 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
-"PO-Revision-Date: 2005-05-26 00:44+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
+"PO-Revision-Date: 2005-07-28 20:52+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"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -301,8 +301,7 @@ 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:163 ftparchive/apt-ftparchive.cc:337
msgid "Package extension list is too long"
@@ -418,8 +417,7 @@ msgstr "Aucune slection ne correspond"
#: ftparchive/apt-ftparchive.cc:830
#, 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:45
#, c-format
@@ -629,7 +627,7 @@ msgstr "Impossible de changer le nom %s en %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -699,12 +697,12 @@ msgstr "%s (en raison de %s) "
#: cmdline/apt-get.cc:544
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"DANGER: Les paquets essentiels suivants vont tre enlevs\n"
-"Vous NE devez PAS faire ceci, moins de savoir exactement ce que vous tes\n"
-"en train de faire!"
+"ATTENTION: Les paquets essentiels suivants vont tre enlevs.\n"
+"Vous NE devez PAS faire ceci, moins de savoir exactement ce\n"
+"que vous tes en train de faire."
#: cmdline/apt-get.cc:575
#, c-format
@@ -777,14 +775,13 @@ msgstr "Il y a des problmes et -y a t employ sans --force-yes"
#: cmdline/apt-get.cc:762
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:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le rpertoire de tlchargement"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut tre lue."
@@ -802,8 +799,7 @@ msgstr "Il est ncessaire de prendre %so dans les archives.\n"
#: cmdline/apt-get.cc:826
#, 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:829
#, c-format
@@ -830,7 +826,7 @@ msgstr "Oui, faites ce que je vous dis !"
#: cmdline/apt-get.cc:865
#, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -846,7 +842,7 @@ msgstr "Annulation."
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n] ? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de rcuprer %s %s\n"
@@ -855,7 +851,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Tlchargement achev et dans le mode tlchargement uniquement"
@@ -869,8 +865,7 @@ msgstr ""
#: cmdline/apt-get.cc:987
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:992
msgid "Unable to correct missing packages."
@@ -932,8 +927,7 @@ msgstr "Aucun paquet ne correspond au paquet %s"
#: cmdline/apt-get.cc:1129
#, 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:1137
#, c-format
@@ -959,7 +953,7 @@ msgstr "Version choisie %s (%s) pour %s\n"
msgid "The update command takes no arguments"
msgstr "La commande de mise jour ne prend pas d'argument"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Impossible de verrouiller le rpertoire de liste"
@@ -975,22 +969,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cass le boulot!"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -998,7 +991,7 @@ msgstr ""
"Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1010,7 +1003,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1019,107 +1012,107 @@ 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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "L'information suivante devrait vous aider rsoudre la situation: "
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Paquets dfectueux"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplmentaires suivants seront installs: "
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Paquets suggrs:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Paquets recommands:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Calcul de la mise jour... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "chec"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spcifier au moins un paquet source"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, 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:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ncessit de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Rcupration des sources %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "chec lors de la rcupration de quelques archives."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de dcompactage %s a chou.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction %s a chou.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "chec du processus fils"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dpendance de construction.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1128,7 +1121,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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1137,33 +1130,32 @@ 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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dpendances de construction"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Modules reconnus:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1336,8 +1328,7 @@ 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."
@@ -1420,7 +1411,7 @@ msgstr "Fichier de configuration en double %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
#, c-format
-msgid "Failed write file %s"
+msgid "Failed to write file %s"
msgstr "Erreur d'criture du fichier %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1568,7 +1559,7 @@ msgid "Internal error adding a diversion"
msgstr "Erreur interne en ajoutant une dviation"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
msgstr "Le cache des paquets doit tre initialis en premier"
#: apt-inst/deb/dpkgdb.cc:386
@@ -1598,8 +1589,7 @@ msgstr "Ce n'est pas une archive DEB valide, partie %s manquante"
#: apt-inst/deb/debfile.cc:52
#, 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:112
#, c-format
@@ -1697,8 +1687,7 @@ 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
@@ -1735,8 +1724,7 @@ 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."
@@ -1780,7 +1768,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problme de hachage du fichier"
@@ -1909,43 +1897,43 @@ msgstr "Ce serveur http possde un support des limites non-valide"
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Slection dfaillante"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Dlai de connexion dpass"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Erreur d'criture du fichier de sortie"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Erreur d'criture sur un fichier"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Erreur d'criture sur le fichier"
-#: methods/http.cc:832
+#: methods/http.cc:836
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:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Mauvais en-tte de donne"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "chec de la connexion"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Erreur interne"
@@ -2270,14 +2258,12 @@ msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de l'URI)"
#: apt-pkg/sourcelist.cc:98
#, 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:105
#, 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:156
#, c-format
@@ -2297,14 +2283,12 @@ msgstr "Ligne %u mal forme dans la liste des sources %s (type)"
#: apt-pkg/sourcelist.cc:191
#, 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:199 apt-pkg/sourcelist.cc:202
#, 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:402
#, c-format
@@ -2325,8 +2309,7 @@ msgstr "Le type de fichier d'index %s n'est pas accept"
#: apt-pkg/algorithms.cc:241
#, 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."
@@ -2381,8 +2364,7 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:48
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:73
msgid "The package lists or status file could not be parsed or opened."
@@ -2415,37 +2397,37 @@ msgstr "Le cache possde un systme de version incompatible"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
@@ -2456,8 +2438,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dpass le nombre de versions que cet APT est capable de traiter."
+msgstr "Vous avez dpass le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2467,12 +2448,12 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:241
#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
@@ -2493,8 +2474,7 @@ msgstr "Assemblage des fichiers lists dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
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:126
#, c-format
@@ -2526,8 +2506,7 @@ msgstr ""
#: apt-pkg/acquire-item.cc:803
#, 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."
@@ -2637,6 +2616,36 @@ msgstr ""
"%i enregistrements crits avec %i fichiers manquants et %i qui ne "
"correspondent pas\n"
+#~ msgid "The pkg cache must be initialize first"
+#~ msgstr "Le cache des paquets doit tre initialis en premier"
+
+#~ msgid "Error occured while processing %s (NewPackage)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
+
+#~ msgid "Error occured while processing %s (UsePackage1)"
+#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
+
+#~ msgid "Error occured while processing %s (UsePackage2)"
+#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
+
+#~ msgid "Error occured while processing %s (NewFileVer1)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
+
+#~ msgid "Error occured while processing %s (NewVersion1)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
+
+#~ msgid "Error occured while processing %s (UsePackage3)"
+#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
+
+#~ msgid "Error occured while processing %s (NewVersion2)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
+
+#~ msgid "Error occured while processing %s (FindPkg)"
+#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
+
+#~ msgid "Error occured while processing %s (CollectFileProvides)"
+#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
+
#~ msgid "Total Package Names : "
#~ msgstr "Nombre total de paquets: "
@@ -2842,32 +2851,3 @@ msgstr ""
#~ msgid "File Not Found"
#~ msgstr "Fichier non trouv"
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Le cache des paquets doit tre initialis en premier"
-
-#~ msgid "Error occurred while processing %s (NewPackage)"
-#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
-
-#~ msgid "Error occurred while processing %s (UsePackage1)"
-#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
-
-#~ msgid "Error occurred while processing %s (UsePackage2)"
-#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
-
-#~ msgid "Error occurred while processing %s (NewFileVer1)"
-#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
-
-#~ msgid "Error occurred while processing %s (NewVersion1)"
-#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
-
-#~ msgid "Error occurred while processing %s (UsePackage3)"
-#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
-
-#~ msgid "Error occurred while processing %s (NewVersion2)"
-#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
-
-#~ msgid "Error occurred while processing %s (FindPkg)"
-#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
-
-#~ msgid "Error occurred while processing %s (CollectFileProvides)"
-#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
diff --git a/po/he.po b/po/he.po
index 189370945..8dae868ef 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -523,7 +523,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -592,8 +592,9 @@ msgid "%s (due to %s) "
msgstr "%s (בגלל %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
@@ -638,8 +639,7 @@ msgstr "לא מצליח לתקן תלויות"
#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
-msgstr ""
-"א ז ה ר ה: החבילות החיוניות הבאות יוסרו"
+msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו"
#: cmdline/apt-get.cc:658
msgid " Done"
@@ -674,11 +674,11 @@ msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא הא
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "רשימת המקורות לא ניתנת לקריאה."
@@ -719,7 +719,7 @@ msgstr "כן, עשה כפי שאני אומר!"
#: cmdline/apt-get.cc:865
#, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -733,7 +733,7 @@ msgstr "בטל."
msgid "Do you want to continue [Y/n]? "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
@@ -742,7 +742,7 @@ msgstr "כשלון בהבאת %s %s\n"
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
@@ -838,7 +838,7 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr ""
@@ -852,27 +852,27 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -880,149 +880,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, 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:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1219,9 +1219,9 @@ msgid "Duplicate conf file %s/%s"
msgstr ""
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "כשלון בפענוח %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
#, c-format
@@ -1566,7 +1566,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1693,43 +1693,43 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr ""
@@ -2256,31 +2256,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, 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:761
+#: apt-pkg/acquire-item.cc:767
#, 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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index cdc21fce3..5dbebd086 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-15 18:03+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -624,7 +624,7 @@ msgstr "Nem sikerült átnevezni a következőt: %s erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -693,8 +693,9 @@ msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n"
@@ -773,11 +774,11 @@ msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül"
msgid "Packages need to be removed but remove is disabled."
msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -816,9 +817,9 @@ msgid "Yes, do as I say!"
msgstr "Igen, tedd amit mondok!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -834,7 +835,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nem sikerült letölteni a következőt: %s %s\n"
@@ -843,7 +844,7 @@ msgstr "Nem sikerült letölteni a következőt: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -944,7 +945,7 @@ msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
@@ -960,22 +961,22 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Nem található a(z) %s csomag"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -983,7 +984,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:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -995,7 +996,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1005,108 +1006,108 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "A következő információ talán segít megoldani a helyzetet:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "A következő extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrásarchívot kell letölteni.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrásarchívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, 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:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1115,7 +1116,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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1124,32 +1125,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1397,8 +1398,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dupla %s/%s konfigurációs fájl"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Nem sikerült a(z) %s fájlba írni"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1755,7 +1756,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1882,43 +1883,43 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat "
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:832
+#: methods/http.cc:836
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:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Kapcsolódás sikertelen"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Belső hiba"
@@ -2461,11 +2462,11 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2474,7 +2475,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2483,14 +2484,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
diff --git a/po/it.po b/po/it.po
index 602e441ab..edb215bbc 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-03-26 00:42+0100\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -623,7 +623,7 @@ msgstr "Impossibile rinominare %s in %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
@@ -692,8 +692,9 @@ msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n"
@@ -774,11 +775,11 @@ msgstr "Sussistono dei problemi e -y stata usata senza --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "I pacchetti devono essere rimossi ma il remove disabilitato."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non pu essere letta."
@@ -819,9 +820,9 @@ msgid "Yes, do as I say!"
msgstr "SI, esegui come richiesto!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -837,7 +838,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
@@ -846,7 +847,7 @@ msgstr "Impossibile ottenere %s %s\n"
msgid "Some files failed to download"
msgstr "Il download di alcuni file fallito"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalit download-only"
@@ -949,7 +950,7 @@ msgstr "Versione selezionata %s (%s) per %s\n"
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Impossibile creare un lock sulla directory di list"
@@ -965,22 +966,22 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -988,7 +989,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1000,7 +1001,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1010,107 +1011,107 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non sufficente"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr " necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr " necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Non stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1119,7 +1120,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1128,32 +1129,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s: %s fallita"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione fallito"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "File di configurazione duplice %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Scrittura del file %s fallita"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1767,7 +1768,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1895,44 +1896,44 @@ msgstr "Questo server HTTP ha il supporto del range bacato"
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:832
+#: methods/http.cc:836
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:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Errore interno"
@@ -2479,11 +2480,11 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2493,7 +2494,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2502,7 +2503,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2510,7 +2511,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
diff --git a/po/ja.po b/po/ja.po
index fa9829bb2..acd03c6cc 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-09 12:54+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -622,7 +622,7 @@ msgstr "%s %s ˥͡ǤޤǤ"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "ɽŸ顼 - %s"
@@ -691,8 +691,9 @@ msgid "%s (due to %s) "
msgstr "%s (%s Τ) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ٹ: ʲԲķѥåޤ\n"
@@ -773,11 +774,11 @@ msgstr "꤬ȯ-y ץ --force-yes ʤǻѤޤ"
msgid "Packages need to be removed but remove is disabled."
msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ"
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "ɥǥ쥯ȥåǤޤ"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "ΥꥹȤɤळȤǤޤ"
@@ -816,9 +817,9 @@ msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -834,7 +835,7 @@ msgstr "Ǥޤ"
msgid "Do you want to continue [Y/n]? "
msgstr "³Ԥޤ [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s μ˼Ԥޤ %s\n"
@@ -843,7 +844,7 @@ msgstr "%s μ˼Ԥޤ %s\n"
msgid "Some files failed to download"
msgstr "ĤΥեμ˼Ԥޤ"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "ɥ꡼⡼ɤǥѥåΥɤλޤ"
@@ -946,7 +947,7 @@ msgstr "%3$s ˤϥС %1$s (%2$s) 򤷤ޤ\n"
msgid "The update command takes no arguments"
msgstr "update ޥɤϰޤ"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "list ǥ쥯ȥå뤳ȤǤޤ"
@@ -962,23 +963,23 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "顼AllUpgrade ˲ޤ"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "ѥå %s դޤ"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ": ɽ '%2$s' Ф %1$s 򤷤ޤ\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷"
"ޤ:"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -986,7 +987,7 @@ msgstr ""
"̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ"
"Ƥ)"
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -998,7 +999,7 @@ msgstr ""
"Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n"
"ƤΤȹͤޤ"
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1008,107 +1009,107 @@ msgstr ""
"ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n"
""
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "줿ѥå"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "ƥѥå:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "侩ѥå:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "åץ졼ɥѥå򸡽ФƤޤ... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "λ"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s ΥѥåĤޤ"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s ˽ʬʶڡޤ"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB %1$sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr " %s \n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "ĤΥ֤μ˼Ԥޤ"
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ÿޥ '%s' Ԥޤ\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ӥɥޥ '%s' Ԥޤ\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "ҥץԤޤ"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s build-dependency 뤳ȤǤޤ"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ˤ build depends ꤵƤޤ\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1117,7 +1118,7 @@ msgstr ""
"ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط"
"Ǥޤ"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1126,32 +1127,32 @@ msgstr ""
"ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s "
" %1$s ΰ¸طȤǤޤ"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s Build-dependency ȤǤޤǤ"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "build dependency ν˼Ԥޤ"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "ݡȤƤ⥸塼:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1402,8 +1403,8 @@ 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 write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "%s ν񤭹ߤ˼Ԥޤ"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1758,7 +1759,7 @@ msgstr "ǡå³ॢ"
msgid "Unable to accept connection"
msgstr "³ accept Ǥޤ"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "եΥϥåǤ"
@@ -1885,43 +1886,43 @@ msgstr "http ФΥ󥸥ݡȤƤޤ"
msgid "Unknown date format"
msgstr "եեޥåȤǤ"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "select ˼Ԥޤ"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "³ॢ"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "ϥեؤν񤭹ߤǥ顼ȯޤ"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "եؤν񤭹ߤǥ顼ȯޤ"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "եؤν񤭹ߤǥ顼ȯޤ"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "⡼¦³ƥФɤ߹ߤ˼Ԥޤ"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Фɤ߹ߤ˼Ԥޤ"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "ʥإåǤ"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "³"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "顼"
@@ -2461,11 +2462,11 @@ msgstr "å¸ IO 顼ȯޤ"
msgid "rename failed, %s (%s -> %s)."
msgstr "͡˼Ԥޤ%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5Sum Ŭ礷ޤ"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2474,7 +2475,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ (¸ߤʤƥΤ)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2483,7 +2484,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ"
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2491,7 +2492,7 @@ msgstr ""
"ѥåǥåե뤬Ƥޤѥå %s Filename: "
"եɤޤ"
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Ŭ礷ޤ"
diff --git a/po/ko.po b/po/ko.po
index 50999a8da..ebb80cb0d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-10 21:56+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <cwryu@debian.org>\n"
@@ -145,7 +145,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -619,7 +619,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -688,8 +688,9 @@ msgid "%s (due to %s) "
msgstr "%s (%s때문에) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n"
@@ -769,11 +770,11 @@ msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되
msgid "Packages need to be removed but remove is disabled."
msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
@@ -815,9 +816,9 @@ msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -833,7 +834,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
@@ -842,7 +843,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
@@ -944,7 +945,7 @@ msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n"
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "목록 디렉토리를 잠글 수 없습니다"
@@ -960,22 +961,22 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -983,7 +984,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -994,7 +995,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1003,105 +1004,105 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "망가진 꾸러미"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "다음 꾸러미를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1110,7 +1111,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1119,32 +1120,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1393,8 +1394,8 @@ 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 write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "%s 파일을 쓰는 데 실패했습니다"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1746,7 +1747,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1873,43 +1874,43 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "내부 오류"
@@ -2442,11 +2443,11 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2455,7 +2456,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2464,14 +2465,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
diff --git a/po/nb.po b/po/nb.po
index ff8fce4a2..ad66a1e9f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n"
@@ -162,7 +162,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -637,7 +637,7 @@ msgstr "Klarte ikke endre navnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulrt uttrykk - %s"
@@ -706,8 +706,9 @@ msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ADVARSEL: Flgende kjernepakker vil bli fjernet\n"
@@ -786,11 +787,11 @@ msgstr "Det oppsto problemer og -y ble brukt uten --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Klarer ikke lse nedlastingsmappa"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -830,9 +831,9 @@ msgid "Yes, do as I say!"
msgstr "Ja, gjr som jeg sier!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -848,7 +849,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke skaffe %s %s\n"
@@ -857,7 +858,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
@@ -959,7 +960,7 @@ msgstr "Utvalgt versjon %s (%s) for %s\n"
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Kan ikke lse listemappa"
@@ -975,21 +976,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -997,7 +998,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1009,7 +1010,7 @@ msgstr ""
"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1019,112 +1020,112 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du br fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Utfrt"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1133,32 +1134,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1409,8 +1410,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dobbel oppsettsfil %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Klarte ikke skrive fila %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1767,7 +1768,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1894,43 +1895,43 @@ msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Intern feil"
@@ -2465,11 +2466,11 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2478,7 +2479,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2487,13 +2488,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:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Feil strrelse"
diff --git a/po/nl.po b/po/nl.po
index f0b90d9bf..48a2801f4 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-10 17:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -627,7 +627,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -696,8 +696,9 @@ msgid "%s (due to %s) "
msgstr "%s (wegens %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n"
@@ -777,11 +778,11 @@ msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -820,9 +821,9 @@ msgid "Yes, do as I say!"
msgstr "Ja, doe wat ik zeg!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -838,7 +839,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -847,7 +848,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -951,7 +952,7 @@ msgstr "Versie %s (%s) geselecteerd voor %s\n"
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
@@ -967,23 +968,23 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -991,7 +992,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:1530
+#: cmdline/apt-get.cc:1539
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1002,7 +1003,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1012,109 +1013,109 @@ msgstr ""
"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
"best een foutrapport indienen voor dit pakket."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald "
"moetworden"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1123,7 +1124,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1132,32 +1133,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1417,8 +1418,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dubbel configuratiebestand %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Wegschrijven van bestand %s is mislukt"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1775,7 +1776,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1904,44 +1905,44 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:832
+#: methods/http.cc:836
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:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Interne fout"
@@ -2489,11 +2490,11 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2502,7 +2503,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2511,7 +2512,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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2519,7 +2520,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
diff --git a/po/nn.po b/po/nn.po
index 4284ac7cd..6bd23e0f9 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -621,7 +621,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -690,8 +690,9 @@ msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
@@ -771,11 +772,11 @@ msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -815,9 +816,9 @@ msgid "Yes, do as I say!"
msgstr "Ja, gjer som eg seier!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -833,7 +834,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -842,7 +843,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -945,7 +946,7 @@ msgstr "Vald versjon %s (%s) for %s\n"
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
@@ -961,22 +962,22 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -984,7 +985,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -996,7 +997,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1006,112 +1007,112 @@ msgstr ""
"pakken rett og slett ikkje lt seg installera. I sfall br du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1120,31 +1121,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dobbel oppsettsfil %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Klarte ikkje skriva fila %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1750,7 +1751,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1877,43 +1878,43 @@ msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Intern feil"
@@ -2448,11 +2449,11 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2461,7 +2462,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2469,14 +2470,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Feil storleik"
diff --git a/po/pl.po b/po/pl.po
index 26a5239b7..be2659af4 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-11 11:47+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -624,7 +624,7 @@ msgstr "Nie udao si zmieni nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Bd kompilacji wyraenia regularnego - %s"
@@ -693,8 +693,9 @@ msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"UWAGA: Zostan usunite nastpujce istotne pakiety\n"
@@ -773,11 +774,11 @@ msgstr "Byy problemy, a uyto -y bez --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Nie udao si zablokowa katalogu pobierania"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nie udao si odczyta list rde."
@@ -816,9 +817,9 @@ msgid "Yes, do as I say!"
msgstr "Tak, rb jak mwi!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -834,7 +835,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Czy chcesz kontynuowa [T/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udao si pobra %s %s\n"
@@ -843,7 +844,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Ukoczono pobieranie w trybie samego pobierania"
@@ -946,7 +947,7 @@ msgstr "Wybrano wersj %s (%s) dla %s\n"
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga adnych argumentw"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Nie udao si zablokowa katalogu list"
@@ -962,21 +963,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udao si odnale pakietu %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -984,7 +985,7 @@ msgstr ""
"Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub "
"podaj rozwizanie)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -996,7 +997,7 @@ msgstr ""
"niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n"
"lub przeniesione z katalogu Incoming (\"Przychodzce\")."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1006,110 +1007,110 @@ msgstr ""
"danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n"
"bd."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pakiety s bdne"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Nie udao si"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udao si odnale rda dla pakietu %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiww rde.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiww rde.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz rdo %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Nie udao si pobra niektrych archiww."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Proces potomny zawid"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zalenoci czasu budowania.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1118,7 +1119,7 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1127,32 +1128,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Nie udao si przetworzy zalenoci na czas budowania"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Obsugiwane moduy:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Zduplikowany plik konfiguracyjny %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Nie udao si zapisa pliku %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1760,7 +1761,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udao si obliczy skrtu pliku"
@@ -1887,43 +1888,43 @@ msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)"
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Operacja select nie powioda si"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Przekroczenie czasu poczenia"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Bd przy pisaniu do pliku wyjciowego"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Bd czytania z serwera"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Bdne dane nagwka"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Poczenie nie udao si"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Bd wewntrzny"
@@ -2463,11 +2464,11 @@ msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udao si zmieni nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2476,7 +2477,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2485,14 +2486,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:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Bdny rozmiar"
diff --git a/po/pt.po b/po/pt.po
index 4b1568efe..84bc5b49d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-03-07 22:20+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -620,7 +620,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -689,8 +689,9 @@ msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"AVISO: Os seguintes pacotes essenciais serão removidos\n"
@@ -770,11 +771,11 @@ msgstr "Há problemas e -y foi usado sem --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -814,9 +815,9 @@ msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -832,7 +833,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Você deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
@@ -841,7 +842,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
@@ -944,7 +945,7 @@ msgstr "Versão seleccionada %s (%s) para %s\n"
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no directório de listas"
@@ -960,21 +961,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -982,7 +983,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -994,7 +995,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requesitados ainda não foram \n"
"criados ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1005,109 +1006,109 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, 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:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, 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:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1116,7 +1117,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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1125,32 +1126,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 requesitos de versão"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1404,8 +1405,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de configuração duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Falha ao escrever ficheiro %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1551,8 +1552,8 @@ msgid "Internal error adding a diversion"
msgstr "Erro Interno ao adicionar um desvio"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
-msgstr "A cache de pacotes deve ser inicializada primeiro"
+msgid "The pkg cache must be initialized first"
+msgstr "A cache de pacotes tem de ser inicializada primeiro"
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading file list"
@@ -1758,7 +1759,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1885,43 +1886,43 @@ msgstr "Este servidor http possui suporte a range errado"
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Erro interno"
@@ -2383,37 +2384,37 @@ msgstr "A Cache possui um sistema de versões incompatível"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu ao processar %s (NovoPacote)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu ao processar %s (UsePacote3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
#: apt-pkg/pkgcachegen.cc:207
@@ -2434,12 +2435,12 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:241
#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "Um erro ocorreu ao processar %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
@@ -2602,34 +2603,34 @@ msgstr ""
"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
"coincidentes\n"
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "A cache de pacotes tem de ser inicializada primeiro"
+#~ msgid "The pkg cache must be initialize first"
+#~ msgstr "A cache de pacotes deve ser inicializada primeiro"
-#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgid "Error occured while processing %s (NewPackage)"
#~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)"
-#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgid "Error occured while processing %s (UsePackage1)"
#~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
-#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgid "Error occured while processing %s (UsePackage2)"
#~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
-#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgid "Error occured while processing %s (NewFileVer1)"
#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
-#~ msgid "Error occurred while processing %s (NewVersion1)"
+#~ msgid "Error occured while processing %s (NewVersion1)"
#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
-#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgid "Error occured while processing %s (UsePackage3)"
#~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)"
-#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgid "Error occured while processing %s (NewVersion2)"
#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
-#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgid "Error occured while processing %s (FindPkg)"
#~ msgstr "Um erro ocorreu ao processar %s (FindPkg)"
-#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgid "Error occured while processing %s (CollectFileProvides)"
#~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)"
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 82271928b..968259925 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n"
-"POT-Creation-Date: 2005-05-23 11:34+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-06-16 10:24-0300\n"
"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -691,8 +691,9 @@ msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"AVISO: Os pacotes essenciais a seguir sero removidos\n"
@@ -815,9 +816,9 @@ msgid "Yes, do as I say!"
msgstr "Sim, faa o que eu digo!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -1401,8 +1402,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de confgiurao duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Falha ao gravar arquivo %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1548,7 +1549,8 @@ msgid "Internal error adding a diversion"
msgstr "Erro Interno ao adicionar um desvio"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+#, fuzzy
+msgid "The pkg cache must be initialized first"
msgstr "O cache de pacotes deve ser inicializado primeiro"
#: apt-inst/deb/dpkgdb.cc:386
@@ -2382,38 +2384,38 @@ msgid "Cache has an incompatible versioning system"
msgstr "O Cache possui um sistema de verses incompatvel"
#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu processando %s (NovoPacote)"
#: apt-pkg/pkgcachegen.cc:129
-#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu processando %s (UsePacote1)"
#: apt-pkg/pkgcachegen.cc:150
-#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu processando %s (UsePacote2)"
#: apt-pkg/pkgcachegen.cc:154
-#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu processando %s (NovaVerso1)"
#: apt-pkg/pkgcachegen.cc:188
-#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu processando %s (UsePacote3)"
#: apt-pkg/pkgcachegen.cc:192
-#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu processando %s (NovaVerso2)"
#: apt-pkg/pkgcachegen.cc:207
@@ -2433,13 +2435,13 @@ msgstr ""
"Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar."
#: apt-pkg/pkgcachegen.cc:241
-#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "Um erro ocorreu processando %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Um erro ocorreu processando %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
diff --git a/po/ro.po b/po/ro.po
index 714787236..30546b718 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2004-11-16 01:22+0200\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <romanian>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -629,7 +629,7 @@ msgstr "Eşuare în a redenumi %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare regex - %s"
@@ -698,8 +698,9 @@ msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
@@ -779,11 +780,11 @@ msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -823,9 +824,9 @@ msgid "Yes, do as I say!"
msgstr "Da, fă cum îţi spun!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -842,7 +843,7 @@ msgstr "Renunţare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreţi să continuaţi? [Y/n] "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
@@ -851,7 +852,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:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
@@ -952,7 +953,7 @@ msgstr "Versiune selectată %s (%s) pentru %s\n"
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
@@ -968,21 +969,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru regex '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -990,7 +991,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:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1003,7 +1004,7 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1013,107 +1014,107 @@ 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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Eşuare"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Gata"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, 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:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie de %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie de %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1122,7 +1123,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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1131,32 +1132,32 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface cererile de versiuni"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Fişier de configurare duplicat %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Eşuare în a scrie fişierul %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1768,7 +1769,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la criptarea fişierului"
@@ -1895,44 +1896,44 @@ msgstr "Acest server http are zonă de suport necorespunzătoare"
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:832
+#: methods/http.cc:836
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:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Eroare internă"
@@ -2476,11 +2477,11 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2489,7 +2490,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 (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2498,7 +2499,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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2506,7 +2507,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
diff --git a/po/ru.po b/po/ru.po
index de0660f8c..5b36cc5ef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-09 19:50+0400\n"
"Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -644,7 +644,7 @@ msgstr "Не удалось переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
@@ -714,8 +714,9 @@ msgid "%s (due to %s) "
msgstr "%s (вследствие %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n"
@@ -796,11 +797,11 @@ msgstr "Существуют проблемы, а опция -y использо
msgid "Packages need to be removed but remove is disabled."
msgstr "Пакеты необходимо удалить, но удаление запрещено."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог для загрузки"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
@@ -843,9 +844,9 @@ msgid "Yes, do as I say!"
msgstr "Да, делать, как я скажу!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -861,7 +862,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось загрузить %s %s\n"
@@ -870,7 +871,7 @@ msgstr "Не удалось загрузить %s %s\n"
msgid "Some files failed to download"
msgstr "Некоторые файлы не удалось загрузить"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
@@ -972,7 +973,7 @@ msgstr "Выбрана версия %s (%s) для %s\n"
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Невозможно заблокировать каталог со списками пакетов"
@@ -988,23 +989,23 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Не могу найти пакет %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1012,7 +1013,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1023,7 +1024,7 @@ msgstr ""
"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
"ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1033,111 +1034,111 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация возможно поможет Вам:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Настойчиво рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Рассчёт обновлений... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
"тексты"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось загрузить."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1146,7 +1147,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1155,32 +1156,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1432,8 +1433,8 @@ 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 write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Не удалось записать файл %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1789,7 +1790,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хэшировании файла"
@@ -1917,43 +1918,43 @@ msgstr "Этот http-сервер не поддерживает загрузк
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2495,11 +2496,11 @@ msgstr "Ошибка ввода/вывода при попытке сохран
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2508,7 +2509,7 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2517,13 +2518,13 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Не совпадает размер"
diff --git a/po/sk.po b/po/sk.po
index c3fc16df9..dd7cb2636 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
-"PO-Revision-Date: 2005-02-09 11:29+0100\n"
-"Last-Translator: Peter KLFMANiK Mann <Peter.Mann@tuke.sk>\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
+"PO-Revision-Date: 2005-07-01 09:34+0200\n"
+"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -322,7 +322,6 @@ msgid "Error processing contents %s"
msgstr "Chyba pri spracovávaní obsahu %s"
#: ftparchive/apt-ftparchive.cc:551
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -377,16 +376,16 @@ msgstr ""
"\n"
"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n"
"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n"
-"veľkosť a MD5 súčet. Podporovaný je tiež súbor override, pomocou ktorého\n"
+"veľkosť a MD5 súčet. Podporovaný je tiež súbor 'override', pomocou ktorého\n"
"môžete vynútiť hodnoty polí Priority a Section.\n"
"\n"
"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n"
-"Sources. Voľbou --source-override môžete určiť zdrojový súbor override.\n"
+"Sources. Voľbou --source-override môžete určiť zdrojový súbor 'override'.\n"
"\n"
"Príkazy 'packages' a 'sources' by sa mali spúšťať v koreni stromu.\n"
"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n"
-"a súbor override by mal obsahovať príznaky pre nahradenie. Ak je udaný\n"
-"prefix_cesty, pridá sa do polí Filename.\n"
+"a súbor 'override' by mal obsahovať príznaky pre nahradenie. Ak je udaný\n"
+"prefix_cesty, pridá sa do polí 'filename'.\n"
"Skutočný príklad z archívu Debianu:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
@@ -394,7 +393,7 @@ msgstr ""
"Voľby:\n"
" -h Táto nápoveda\n"
" --md5 Vygeneruje kontrolný MD5 súčet\n"
-" -s=? Zdrojový súbor override\n"
+" -s=? Zdrojový súbor 'override'\n"
" -q Tichý režim\n"
" -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n"
" --no-delink Povolí ladiaci režim\n"
@@ -619,7 +618,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -688,8 +687,9 @@ msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
@@ -768,11 +768,11 @@ msgstr "Nastali problémy a -y bolo použité bez --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
@@ -811,9 +811,9 @@ msgid "Yes, do as I say!"
msgstr "Áno, urob to, čo vravím!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -829,7 +829,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -838,7 +838,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
@@ -938,7 +938,7 @@ msgstr "Zvolená verzia %s (%s) pre %s\n"
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
@@ -954,21 +954,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, 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:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -976,7 +976,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -988,7 +988,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -998,114 +998,114 @@ 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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, 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:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, 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:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1114,31 +1114,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1387,8 +1387,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Duplicitný konfiguračný súbor %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Zápis do súboru %s zlyhal"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1534,8 +1534,9 @@ msgid "Internal error adding a diversion"
msgstr "Vnútorná chyba pri pridávaní diverzie"
#: apt-inst/deb/dpkgdb.cc:383
+#, fuzzy
msgid "The pkg cache must be initialized first"
-msgstr "Vyrovnávacia pamäť balíkov sa najprv musí inicializovať"
+msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading file list"
@@ -1741,7 +1742,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1868,43 +1869,43 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov"
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2358,39 +2359,39 @@ msgid "Cache has an incompatible versioning system"
msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
#: apt-pkg/pkgcachegen.cc:117
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Pri spracovaní %s sa objavila chyba (NewPackage)"
+msgstr "Chyba pri spracovaní %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Pri spracovaní %s sa objavila chyba (UsePackage1)"
+msgstr "Chyba pri spracovaní %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Pri spracovaní %s sa objavila chyba (UsePackage2)"
+msgstr "Chyba pri spracovaní %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Pri spracovaní %s sa objavila chyba (NewFileVer1)"
+msgstr "Chyba pri spracovaní %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Pri spracovaní %s sa objavila chyba (NewVersion1)"
+msgstr "Chyba pri spracovaní %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Pri spracovaní %s sa objavila chyba (UsePackage3)"
+msgstr "Chyba pri spracovaní %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Pri spracovaní %s sa objavila chyba (NewVersion2)"
+msgstr "Chyba pri spracovaní %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2407,14 +2408,14 @@ msgstr ""
"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
#: apt-pkg/pkgcachegen.cc:241
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Chyba pri spracovaní %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, c-format
+#, fuzzy, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Pri spracovaní %s sa objavila chyba (CollectFileProvides)"
+msgstr "Chyba pri spracovaní %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
@@ -2439,11 +2440,11 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2452,7 +2453,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2461,13 +2462,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:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
diff --git a/po/sl.po b/po/sl.po
index 2147c6f53..ad8aea470 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure uhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -145,7 +145,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -616,7 +616,7 @@ msgstr "Ni mogoe preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -685,8 +685,9 @@ msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n"
@@ -765,11 +766,11 @@ msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoe brati."
@@ -808,9 +809,9 @@ msgid "Yes, do as I say!"
msgstr "Da, naredi tako kot pravim!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -826,7 +827,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
@@ -835,7 +836,7 @@ msgstr "Ni mogoe dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
@@ -936,7 +937,7 @@ msgstr "Izbrana razliica %s (%s) za %s\n"
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoe zakleniti"
@@ -952,21 +953,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -974,7 +975,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -985,7 +986,7 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -995,115 +996,115 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1112,31 +1113,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1387,8 +1388,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Dvojnik datoteke z nastavitvami %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Napaka pri pisanju datoteke %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1740,7 +1741,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1867,43 +1868,43 @@ msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2437,11 +2438,11 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2450,7 +2451,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2459,7 +2460,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2467,7 +2468,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
diff --git a/po/sv.po b/po/sv.po
index 17827b7cc..367f6680e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-01-15 15:30+0100\n"
"Last-Translator: Peter Karlsson <peterk@debian.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -628,7 +628,7 @@ msgstr "Misslyckades att byta namn p %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljrt uttryck - %s"
@@ -697,8 +697,9 @@ msgid "%s (due to %s) "
msgstr "%s (p grund av %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"VARNING: Fljande systemkritiska paket kommer att tas bort\n"
@@ -777,11 +778,11 @@ msgstr "Problem har uppsttt och -y anvndes utan --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Kunde inte lsa hmtningskatalogen."
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
@@ -820,9 +821,9 @@ msgid "Yes, do as I say!"
msgstr "Ja, gr som jag sger!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -839,7 +840,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortstta [J/n]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades att hmta %s %s\n"
@@ -848,7 +849,7 @@ msgstr "Misslyckades att hmta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades att hmta vissa filer"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Hmtningen frdig i \"endast-hmta\"-lge"
@@ -950,7 +951,7 @@ msgstr "Vald version %s (%s) fr %s\n"
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Kunde inte lsa listkatalogen"
@@ -966,21 +967,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, vljer %s fr regex \"%s\"\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -988,7 +989,7 @@ msgstr ""
"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
"(eller ange en lsning)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1000,7 +1001,7 @@ msgstr ""
"distributionen, att ngra krvda paket nnu inte har skapats eller\n"
"lagts in frn \"Incoming\"."
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1010,105 +1011,105 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta br\n"
"skrivas."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Fljande information kan vara till hjlp fr att lsa situationen:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Fljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Freslagna paket:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Berknar uppgradering... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta ngot kllkodspaket fr %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behver hmta %sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Hmtar kllkod %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Misslyckades att hmta vissa arkiv."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hmta byggberoendeinformation fr %s"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1116,7 +1117,7 @@ msgid ""
msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1125,32 +1126,32 @@ msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
"versioner av paketet %s uppfyller versionskraven"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s "
"r fr nytt"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden fr %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Moduler som stds:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1406,8 +1407,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Duplicerad konfigurationsfil %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Misslyckades att skriva filen %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1762,7 +1763,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lgga filen till hashtabellen"
@@ -1894,43 +1895,43 @@ msgstr "Denna http-servers std fr delvis hmtning fungerar inte"
msgid "Unknown date format"
msgstr "Oknt datumformat"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Tidsgrnsen fr anslutningen nddes"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Fel vid lsning frn server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Internt fel"
@@ -2472,11 +2473,11 @@ msgstr "In-/utfel vid lagring av kllcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2485,7 +2486,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:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2494,13 +2495,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:797
+#: apt-pkg/acquire-item.cc:803
#, 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:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
diff --git a/po/tl.po b/po/tl.po
index f4d26b826..9fc7a93ba 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-09 16:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -628,7 +628,7 @@ msgstr "Sawi ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -697,8 +697,9 @@ msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n"
@@ -779,11 +780,11 @@ msgid "Packages need to be removed but remove is disabled."
msgstr ""
"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Di maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -822,9 +823,9 @@ msgid "Yes, do as I say!"
msgstr "Oo, gawin ang sinasabi ko!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -840,7 +841,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sawi sa pagkuha ng %s %s\n"
@@ -849,7 +850,7 @@ msgstr "Sawi sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga tipunang hindi nakuha"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang"
@@ -951,7 +952,7 @@ msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
@@ -967,22 +968,22 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -990,7 +991,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -1001,7 +1002,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1011,106 +1012,106 @@ msgstr ""
"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Kinakalkula ang upgrade... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Sawi"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Sawi sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Sawi ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay sawi.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Sawi ang prosesong anak"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1119,7 +1120,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1128,32 +1129,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:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Sawi sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s"
msgstr "Nadobleng tipunang conf %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Sawi sa pagsulat ng tipunang %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1760,7 +1761,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:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng tipunan"
@@ -1887,43 +1888,43 @@ msgstr "Sira ang range support ng HTTP server na ito"
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Sawi ang pagpili"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng tipunang output"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Error sa pagsulat sa tipunan"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa tipunan"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Maling datos sa header"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Sawi ang koneksyon"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Internal na error"
@@ -2469,11 +2470,11 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2482,7 +2483,7 @@ msgstr ""
"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2491,7 +2492,7 @@ msgstr ""
"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2499,7 +2500,7 @@ msgstr ""
"Sira ang tipunang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Di tugmang laki"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d6fa9be1d..f7c0ae1b3 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-09 17:34+0800\n"
"Last-Translator: Tchaikov <chaisave@263.net>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -618,7 +618,7 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -687,8 +687,9 @@ msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"【警告】：下列的重要软件包将被卸载 \n"
@@ -767,11 +768,11 @@ msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
@@ -810,9 +811,9 @@ msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -828,7 +829,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -837,7 +838,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
@@ -938,7 +939,7 @@ msgstr "选定了版本为 %s (%s) 的 %s\n"
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
@@ -953,21 +954,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误，AllUpgrade 造成某些故障"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -975,7 +976,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -986,7 +987,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -995,112 +996,112 @@ msgstr ""
"您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对问题的解决有所帮助："
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "受损安装包"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "将会安装下列的额外的软件包："
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1109,30 +1110,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "被支持模块："
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1378,8 +1379,8 @@ 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 write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1730,7 +1731,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1857,43 +1858,43 @@ msgstr "该 http 服务器的 range 支持不正常"
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "内部错误"
@@ -2427,11 +2428,11 @@ msgstr "无法写入来源缓存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2440,7 +2441,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2448,13 +2449,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "大小不符"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cafc2bd5f..f3b425929 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: 2005-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-02-19 22:24+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -620,7 +620,7 @@ msgstr "無法將 %s 更名為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示法出錯 - %s"
@@ -689,8 +689,9 @@ msgid "%s (due to %s) "
msgstr "%s（因為 %s）"
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"警告：下列的重要套件都將被刪除\n"
@@ -769,11 +770,11 @@ msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "有套件需要被移除,但移除動作被禁止。"
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載的目錄"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "無法讀取來源單。"
@@ -812,9 +813,9 @@ msgid "Yes, do as I say!"
msgstr "是的,請執行我所指定的"
#: cmdline/apt-get.cc:865
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
@@ -830,7 +831,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法下載『%s』檔案。%s\n"
@@ -839,7 +840,7 @@ msgstr "無法下載『%s』檔案。%s\n"
msgid "Some files failed to download"
msgstr "部份檔案無法下載"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "下載完畢,目前是“僅下載”模式"
@@ -940,7 +941,7 @@ msgstr "選定的版本為 %s (%s) 的 %s\n"
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
@@ -954,21 +955,21 @@ msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -976,7 +977,7 @@ msgstr ""
"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
"定一個解決辦法)。"
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -987,7 +988,7 @@ msgstr ""
"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
"或從 Incoming 目錄移除。"
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -997,112 +998,112 @@ msgstr ""
"該套件無法安裝,您最好提交一個針對這個套件\n"
"的臭蟲報告。"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "底下的資訊有助於解決現在的情況:"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "下列的【新】套件都將被安裝："
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "籌畫升級套件中..."
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr "必須指定至少一個對應的套件才能下載源碼"
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 套件的源碼"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "下載源碼 %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "無法下載某些檔案。"
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "執行建立套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的建構相依關係。"
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相依關係訊息。\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, 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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1111,30 +1112,30 @@ msgstr ""
"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
"相依關係"
-#: cmdline/apt-get.cc:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所要求的建構相依關係。"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "無法處理建構相依關係"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "支援模組:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1382,8 +1383,8 @@ 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 write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "寫入檔案 %s 失敗"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1733,7 +1734,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法允許連線"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
@@ -1860,43 +1861,43 @@ msgstr "http 伺服器有損毀的範圍支援"
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "從遠端主機讀取錯誤，關閉連線"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "內部錯誤"
@@ -2425,31 +2426,31 @@ msgstr "無法寫入來源暫存檔。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, 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:761
+#: apt-pkg/acquire-item.cc:767
#, 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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "檔案大小不符合。"
diff --git a/test/conf_clear.cc b/test/conf_clear.cc
new file mode 100644
index 000000000..259aa0f39
--- /dev/null
+++ b/test/conf_clear.cc
@@ -0,0 +1,23 @@
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+
+using namespace std;
+
+int main(int argc,const char *argv[])
+{
+ Configuration Cnf;
+
+ cout << "adding elements" << endl;
+ Cnf.Set("APT::Keep-Fds::",28);
+ Cnf.Set("APT::Keep-Fds::",17);
+ Cnf.Set("APT::Keep-Fds::",47);
+ Cnf.Dump();
+
+ cout << "Removing elements" << endl;
+ Cnf.Clear("APT::Keep-Fds",17);
+ Cnf.Clear("APT::Keep-Fds",28);
+ Cnf.Clear("APT::Keep-Fds",47);
+ Cnf.Dump();
+
+ return 0;
+}
diff --git a/test/makefile b/test/makefile
index 9ad6233c2..a9dbdc34d 100644
--- a/test/makefile
+++ b/test/makefile
@@ -39,6 +39,12 @@ SOURCE = testextract.cc
include $(PROGRAM_H)
# Program for testing the config file parser
+PROGRAM=conftest_clear
+SLIBS = -lapt-pkg
+SOURCE = conf_clear.cc
+include $(PROGRAM_H)
+
+# Program for testing the config file parser
PROGRAM=conftest
SLIBS = -lapt-pkg
SOURCE = conf.cc
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 15:39:22 +0000