summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/cdrom.cc776
-rw-r--r--apt-pkg/cdrom.h71
-rw-r--r--apt-pkg/contrib/fileutl.cc5
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--apt-pkg/contrib/sha1.cc11
-rw-r--r--apt-pkg/deb/dpkgpm.cc19
-rw-r--r--apt-pkg/deb/dpkgpm.h2
-rw-r--r--apt-pkg/indexcopy.cc (renamed from cmdline/indexcopy.cc)208
-rw-r--r--apt-pkg/indexcopy.h (renamed from cmdline/indexcopy.h)16
-rw-r--r--apt-pkg/indexrecords.cc11
-rw-r--r--apt-pkg/indexrecords.h4
-rw-r--r--apt-pkg/makefile6
-rw-r--r--apt-pkg/packagemanager.h2
-rw-r--r--cmdline/apt-cdrom.cc705
-rw-r--r--cmdline/makefile2
-rw-r--r--configure.in2
-rw-r--r--debian/apt.cron.daily1
-rw-r--r--debian/changelog22
-rwxr-xr-xdebian/rules2
-rw-r--r--doc/pl/offline.pl.sgml180
-rw-r--r--po/apt-all.pot116
-rw-r--r--po/bs.po429
-rw-r--r--po/ca.po448
-rw-r--r--po/cs.po443
-rw-r--r--po/da.po513
-rw-r--r--po/de.UTF-8.po479
-rw-r--r--po/de.po479
-rw-r--r--po/el.po496
-rw-r--r--po/en_GB.po433
-rw-r--r--po/es.po483
-rw-r--r--po/eu.po473
-rw-r--r--po/fi.po444
-rw-r--r--po/fr.po138
-rw-r--r--po/he.po427
-rw-r--r--po/hu.po441
-rw-r--r--po/it.po479
-rw-r--r--po/ja.po443
-rw-r--r--po/ko.po443
-rw-r--r--po/nb.po119
-rw-r--r--po/nl.po443
-rw-r--r--po/nn.po443
-rw-r--r--po/pl.po119
-rw-r--r--po/pt.po448
-rw-r--r--po/pt_BR.po448
-rw-r--r--po/ro.po586
-rw-r--r--po/ru.po484
-rw-r--r--po/sk.po443
-rw-r--r--po/sl.po119
-rw-r--r--po/sv.po443
-rw-r--r--po/tl.po441
-rw-r--r--po/zh_CN.po447
-rw-r--r--po/zh_TW.po122
52 files changed, 9271 insertions, 5488 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
new file mode 100644
index 000000000..a91fc7181
--- /dev/null
+++ b/apt-pkg/cdrom.cc
@@ -0,0 +1,776 @@
+/*
+ */
+
+#ifdef __GNUG__
+#pragma implementation "apt-pkg/cdrom.h"
+#endif
+#include<apt-pkg/init.h>
+#include<apt-pkg/error.h>
+#include<apt-pkg/cdromutl.h>
+#include<apt-pkg/strutl.h>
+#include<apt-pkg/cdrom.h>
+#include<sstream>
+#include<fstream>
+#include<config.h>
+#include<apti18n.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdio.h>
+
+
+#include "indexcopy.h"
+
+using namespace std;
+
+// FindPackages - Find the package files on the CDROM /*{{{*/
+// ---------------------------------------------------------------------
+/* We look over the cdrom for package files. This is a recursive
+ search that short circuits when it his a package file in the dir.
+ This speeds it up greatly as the majority of the size is in the
+ binary-* sub dirs. */
+bool pkgCdrom::FindPackages(string CD,vector<string> &List,
+ vector<string> &SList, vector<string> &SigList,
+ string &InfoDir, pkgCdromStatus *log,
+ unsigned int Depth)
+{
+ static ino_t Inodes[9];
+
+ // if we have a look we "pulse" now
+ if(log)
+ log->Update();
+
+ if (Depth >= 7)
+ return true;
+
+ if (CD[CD.length()-1] != '/')
+ CD += '/';
+
+ if (chdir(CD.c_str()) != 0)
+ return _error->Errno("chdir","Unable to change to %s",CD.c_str());
+
+ // Look for a .disk subdirectory
+ struct stat Buf;
+ if (stat(".disk",&Buf) == 0)
+ {
+ if (InfoDir.empty() == true)
+ InfoDir = CD + ".disk/";
+ }
+
+ // Don't look into directories that have been marked to ingore.
+ if (stat(".aptignr",&Buf) == 0)
+ return true;
+
+
+ /* Check _first_ for a signature file as apt-cdrom assumes that all files
+ under a Packages/Source file are in control of that file and stops
+ the scanning
+ */
+ if (stat("Release.gpg",&Buf) == 0)
+ {
+ SigList.push_back(CD);
+ }
+ /* Aha! We found some package files. We assume that everything under
+ this dir is controlled by those package files so we don't look down
+ anymore */
+ if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0)
+ {
+ List.push_back(CD);
+
+ // Continue down if thorough is given
+ if (_config->FindB("APT::CDROM::Thorough",false) == false)
+ return true;
+ }
+ if (stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0)
+ {
+ SList.push_back(CD);
+
+ // Continue down if thorough is given
+ if (_config->FindB("APT::CDROM::Thorough",false) == false)
+ return true;
+ }
+
+ DIR *D = opendir(".");
+ if (D == 0)
+ return _error->Errno("opendir","Unable to read %s",CD.c_str());
+
+ // Run over the directory
+ for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
+ {
+ // Skip some files..
+ if (strcmp(Dir->d_name,".") == 0 ||
+ strcmp(Dir->d_name,"..") == 0 ||
+ //strcmp(Dir->d_name,"source") == 0 ||
+ strcmp(Dir->d_name,".disk") == 0 ||
+ strcmp(Dir->d_name,"experimental") == 0 ||
+ strcmp(Dir->d_name,"binary-all") == 0 ||
+ strcmp(Dir->d_name,"debian-installer") == 0)
+ continue;
+
+ // See if the name is a sub directory
+ struct stat Buf;
+ if (stat(Dir->d_name,&Buf) != 0)
+ continue;
+
+ if (S_ISDIR(Buf.st_mode) == 0)
+ continue;
+
+ unsigned int I;
+ for (I = 0; I != Depth; I++)
+ if (Inodes[I] == Buf.st_ino)
+ break;
+ if (I != Depth)
+ continue;
+
+ // Store the inodes weve seen
+ Inodes[Depth] = Buf.st_ino;
+
+ // Descend
+ if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false)
+ break;
+
+ if (chdir(CD.c_str()) != 0)
+ return _error->Errno("chdir","Unable to change to %s",CD.c_str());
+ };
+
+ closedir(D);
+
+ return !_error->PendingError();
+}
+
+// Score - We compute a 'score' for a path /*{{{*/
+// ---------------------------------------------------------------------
+/* Paths are scored based on how close they come to what I consider
+ normal. That is ones that have 'dist' 'stable' 'testing' will score
+ higher than ones without. */
+int pkgCdrom::Score(string Path)
+{
+ int Res = 0;
+ if (Path.find("stable/") != string::npos)
+ Res += 29;
+ if (Path.find("/binary-") != string::npos)
+ Res += 20;
+ if (Path.find("testing/") != string::npos)
+ Res += 28;
+ if (Path.find("unstable/") != string::npos)
+ Res += 27;
+ if (Path.find("/dists/") != string::npos)
+ Res += 40;
+ if (Path.find("/main/") != string::npos)
+ Res += 20;
+ if (Path.find("/contrib/") != string::npos)
+ Res += 20;
+ if (Path.find("/non-free/") != string::npos)
+ Res += 20;
+ if (Path.find("/non-US/") != string::npos)
+ Res += 20;
+ if (Path.find("/source/") != string::npos)
+ Res += 10;
+ if (Path.find("/debian/") != string::npos)
+ Res -= 10;
+ return Res;
+}
+
+ /*}}}*/
+// DropBinaryArch - Dump dirs with a string like /binary-<foo>/ /*{{{*/
+// ---------------------------------------------------------------------
+/* Here we drop everything that is not this machines arch */
+bool pkgCdrom::DropBinaryArch(vector<string> &List)
+{
+ char S[300];
+ snprintf(S,sizeof(S),"/binary-%s/",
+ _config->Find("Apt::Architecture").c_str());
+
+ for (unsigned int I = 0; I < List.size(); I++)
+ {
+ const char *Str = List[I].c_str();
+
+ const char *Res;
+ if ((Res = strstr(Str,"/binary-")) == 0)
+ continue;
+
+ // Weird, remove it.
+ if (strlen(Res) < strlen(S))
+ {
+ List.erase(List.begin() + I);
+ I--;
+ continue;
+ }
+
+ // See if it is our arch
+ if (stringcmp(Res,Res + strlen(S),S) == 0)
+ continue;
+
+ // Erase it
+ List.erase(List.begin() + I);
+ I--;
+ }
+
+ return true;
+}
+
+
+// DropRepeats - Drop repeated files resulting from symlinks /*{{{*/
+// ---------------------------------------------------------------------
+/* Here we go and stat every file that we found and strip dup inodes. */
+bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
+{
+ // Get a list of all the inodes
+ ino_t *Inodes = new ino_t[List.size()];
+ for (unsigned int I = 0; I != List.size(); I++)
+ {
+ struct stat Buf;
+ if (stat((List[I] + Name).c_str(),&Buf) != 0 &&
+ stat((List[I] + Name + ".gz").c_str(),&Buf) != 0)
+ _error->Errno("stat","Failed to stat %s%s",List[I].c_str(),
+ Name);
+ Inodes[I] = Buf.st_ino;
+ }
+
+ if (_error->PendingError() == true)
+ return false;
+
+ // Look for dups
+ for (unsigned int I = 0; I != List.size(); I++)
+ {
+ for (unsigned int J = I+1; J < List.size(); J++)
+ {
+ // No match
+ if (Inodes[J] != Inodes[I])
+ continue;
+
+ // We score the two paths.. and erase one
+ int ScoreA = Score(List[I]);
+ int ScoreB = Score(List[J]);
+ if (ScoreA < ScoreB)
+ {
+ List[I] = string();
+ break;
+ }
+
+ List[J] = string();
+ }
+ }
+
+ // Wipe erased entries
+ for (unsigned int I = 0; I < List.size();)
+ {
+ if (List[I].empty() == false)
+ I++;
+ else
+ List.erase(List.begin()+I);
+ }
+
+ return true;
+}
+ /*}}}*/
+
+// ReduceSourceList - Takes the path list and reduces it /*{{{*/
+// ---------------------------------------------------------------------
+/* This takes the list of source list expressed entires and collects
+ similar ones to form a single entry for each dist */
+void pkgCdrom::ReduceSourcelist(string CD,vector<string> &List)
+{
+ sort(List.begin(),List.end());
+
+ // Collect similar entries
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ {
+ // Find a space..
+ string::size_type Space = (*I).find(' ');
+ if (Space == string::npos)
+ continue;
+ string::size_type SSpace = (*I).find(' ',Space + 1);
+ if (SSpace == string::npos)
+ continue;
+
+ string Word1 = string(*I,Space,SSpace-Space);
+ string Prefix = string(*I,0,Space);
+ for (vector<string>::iterator J = List.begin(); J != I; J++)
+ {
+ // Find a space..
+ string::size_type Space2 = (*J).find(' ');
+ if (Space2 == string::npos)
+ continue;
+ string::size_type SSpace2 = (*J).find(' ',Space2 + 1);
+ if (SSpace2 == string::npos)
+ continue;
+
+ if (string(*J,0,Space2) != Prefix)
+ continue;
+ if (string(*J,Space2,SSpace2-Space2) != Word1)
+ continue;
+
+ *J += string(*I,SSpace);
+ *I = string();
+ }
+ }
+
+ // Wipe erased entries
+ for (unsigned int I = 0; I < List.size();)
+ {
+ if (List[I].empty() == false)
+ I++;
+ else
+ List.erase(List.begin()+I);
+ }
+}
+ /*}}}*/
+// WriteDatabase - Write the CDROM Database file /*{{{*/
+// ---------------------------------------------------------------------
+/* We rewrite the configuration class associated with the cdrom database. */
+bool pkgCdrom::WriteDatabase(Configuration &Cnf)
+{
+ string DFile = _config->FindFile("Dir::State::cdroms");
+ string NewFile = DFile + ".new";
+
+ unlink(NewFile.c_str());
+ ofstream Out(NewFile.c_str());
+ if (!Out)
+ return _error->Errno("ofstream::ofstream",
+ "Failed to open %s.new",DFile.c_str());
+
+ /* Write out all of the configuration directives by walking the
+ configuration tree */
+ const Configuration::Item *Top = Cnf.Tree(0);
+ for (; Top != 0;)
+ {
+ // Print the config entry
+ if (Top->Value.empty() == false)
+ Out << Top->FullTag() + " \"" << Top->Value << "\";" << endl;
+
+ if (Top->Child != 0)
+ {
+ Top = Top->Child;
+ continue;
+ }
+
+ while (Top != 0 && Top->Next == 0)
+ Top = Top->Parent;
+ if (Top != 0)
+ Top = Top->Next;
+ }
+
+ Out.close();
+
+ rename(DFile.c_str(),string(DFile + '~').c_str());
+ if (rename(NewFile.c_str(),DFile.c_str()) != 0)
+ return _error->Errno("rename","Failed to rename %s.new to %s",
+ DFile.c_str(),DFile.c_str());
+
+ return true;
+}
+ /*}}}*/
+// WriteSourceList - Write an updated sourcelist /*{{{*/
+// ---------------------------------------------------------------------
+/* This reads the old source list and copies it into the new one. It
+ appends the new CDROM entires just after the first block of comments.
+ This places them first in the file. It also removes any old entries
+ that were the same. */
+bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
+{
+ if (List.size() == 0)
+ return true;
+
+ string File = _config->FindFile("Dir::Etc::sourcelist");
+
+ // Open the stream for reading
+ ifstream F((FileExists(File)?File.c_str():"/dev/null"),
+ ios::in );
+ if (!F != 0)
+ return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
+
+ string NewFile = File + ".new";
+ unlink(NewFile.c_str());
+ ofstream Out(NewFile.c_str());
+ if (!Out)
+ return _error->Errno("ofstream::ofstream",
+ "Failed to open %s.new",File.c_str());
+
+ // Create a short uri without the path
+ string ShortURI = "cdrom:[" + Name + "]/";
+ string ShortURI2 = "cdrom:" + Name + "/"; // For Compatibility
+
+ string Type;
+ if (Source == true)
+ Type = "deb-src";
+ else
+ Type = "deb";
+
+ char Buffer[300];
+ int CurLine = 0;
+ bool First = true;
+ while (F.eof() == false)
+ {
+ F.getline(Buffer,sizeof(Buffer));
+ CurLine++;
+ _strtabexpand(Buffer,sizeof(Buffer));
+ _strstrip(Buffer);
+
+ // Comment or blank
+ if (Buffer[0] == '#' || Buffer[0] == 0)
+ {
+ Out << Buffer << endl;
+ continue;
+ }
+
+ if (First == true)
+ {
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ {
+ string::size_type Space = (*I).find(' ');
+ if (Space == string::npos)
+ return _error->Error("Internal error");
+ Out << Type << " cdrom:[" << Name << "]/" << string(*I,0,Space) <<
+ " " << string(*I,Space+1) << endl;
+ }
+ }
+ First = false;
+
+ // Grok it
+ string cType;
+ string URI;
+ const char *C = Buffer;
+ if (ParseQuoteWord(C,cType) == false ||
+ ParseQuoteWord(C,URI) == false)
+ {
+ Out << Buffer << endl;
+ continue;
+ }
+
+ // Emit lines like this one
+ if (cType != Type || (string(URI,0,ShortURI.length()) != ShortURI &&
+ string(URI,0,ShortURI.length()) != ShortURI2))
+ {
+ Out << Buffer << endl;
+ continue;
+ }
+ }
+
+ // Just in case the file was empty
+ if (First == true)
+ {
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ {
+ string::size_type Space = (*I).find(' ');
+ if (Space == string::npos)
+ return _error->Error("Internal error");
+
+ Out << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) <<
+ " " << string(*I,Space+1) << endl;
+ }
+ }
+
+ Out.close();
+
+ rename(File.c_str(),string(File + '~').c_str());
+ if (rename(NewFile.c_str(),File.c_str()) != 0)
+ return _error->Errno("rename","Failed to rename %s.new to %s",
+ File.c_str(),File.c_str());
+
+ return true;
+}
+
+
+bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
+{
+ stringstream msg;
+
+ // Startup
+ string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+ if (CDROM[0] == '.')
+ CDROM= SafeGetCWD() + '/' + CDROM;
+
+ if(log) {
+ msg.str("");
+ ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"),
+ CDROM.c_str());
+ log->Update(msg.str());
+ }
+ if (MountCdrom(CDROM) == false)
+ return _error->Error("Failed to mount the cdrom.");
+
+ // Hash the CD to get an ID
+ if(log)
+ log->Update(_("Identifying.. "));
+
+
+ if (IdentCdrom(CDROM,ident) == false)
+ {
+ ident = "";
+ return false;
+ }
+
+ msg.str("");
+ ioprintf(msg, "[%s]\n",ident.c_str());
+ log->Update(msg.str());
+
+
+ // Read the database
+ Configuration Database;
+ string DFile = _config->FindFile("Dir::State::cdroms");
+ if (FileExists(DFile) == true)
+ {
+ if (ReadConfigFile(Database,DFile) == false)
+ return _error->Error("Unable to read the cdrom database %s",
+ DFile.c_str());
+ }
+ if(log) {
+ msg.str("");
+ ioprintf(msg, _("Stored Label: %s \n"),
+ Database.Find("CD::"+ident).c_str());
+ log->Update(msg.str());
+ }
+ return true;
+}
+
+
+bool pkgCdrom::Add(pkgCdromStatus *log)
+{
+ stringstream msg;
+
+ // Startup
+ string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+ if (CDROM[0] == '.')
+ CDROM= SafeGetCWD() + '/' + CDROM;
+
+ if(log) {
+ log->SetTotal(STEP_LAST);
+ msg.str("");
+ ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());
+ log->Update(msg.str(), STEP_PREPARE);
+ }
+
+ // Read the database
+ Configuration Database;
+ string DFile = _config->FindFile("Dir::State::cdroms");
+ if (FileExists(DFile) == true)
+ {
+ if (ReadConfigFile(Database,DFile) == false)
+ return _error->Error("Unable to read the cdrom database %s",
+ DFile.c_str());
+ }
+
+ // Unmount the CD and get the user to put in the one they want
+ if (_config->FindB("APT::CDROM::NoMount",false) == false)
+ {
+ if(log)
+ log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
+ UnmountCdrom(CDROM);
+
+ if(log) {
+ log->Update(_("Waiting for disc...\n"), STEP_WAIT);
+ if(!log->ChangeCdrom()) {
+ // user aborted
+ return false;
+ }
+ }
+
+ // Mount the new CDROM
+ log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT);
+ if (MountCdrom(CDROM) == false)
+ return _error->Error("Failed to mount the cdrom.");
+ }
+
+ // Hash the CD to get an ID
+ if(log)
+ log->Update(_("Identifying.. "), STEP_IDENT);
+ string ID;
+ if (IdentCdrom(CDROM,ID) == false)
+ {
+ log->Update("\n");
+ return false;
+ }
+ if(log)
+ log->Update("["+ID+"]\n");
+
+ if(log)
+ log->Update(_("Scanning Disc for index files..\n"),STEP_SCAN);
+
+ // Get the CD structure
+ vector<string> List;
+ vector<string> SourceList;
+ vector<string> SigList;
+ string StartDir = SafeGetCWD();
+ string InfoDir;
+ if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false)
+ {
+ log->Update("\n");
+ return false;
+ }
+
+ chdir(StartDir.c_str());
+
+ if (_config->FindB("Debug::aptcdrom",false) == true)
+ {
+ cout << "I found (binary):" << endl;
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ cout << *I << endl;
+ cout << "I found (source):" << endl;
+ for (vector<string>::iterator I = SourceList.begin(); I != SourceList.end(); I++)
+ cout << *I << endl;
+ cout << "I found (Signatures):" << endl;
+ for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); I++)
+ cout << *I << endl;
+ }
+
+ //log->Update(_("Cleaning package lists..."), STEP_CLEAN);
+
+ // Fix up the list
+ DropBinaryArch(List);
+ DropRepeats(List,"Packages");
+ DropRepeats(SourceList,"Sources");
+ DropRepeats(SigList,"Release.gpg");
+ if(log) {
+ msg.str("");
+ ioprintf(msg, _("Found %i package indexes, %i source indexes and "
+ "%i signatures\n"),
+ List.size(), SourceList.size(), SigList.size());
+ log->Update(msg.str(), STEP_SCAN);
+ }
+
+ if (List.size() == 0 && SourceList.size() == 0)
+ return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc");
+
+ // Check if the CD is in the database
+ string Name;
+ if (Database.Exists("CD::" + ID) == false ||
+ _config->FindB("APT::CDROM::Rename",false) == true)
+ {
+ // Try to use the CDs label if at all possible
+ if (InfoDir.empty() == false &&
+ FileExists(InfoDir + "/info") == true)
+ {
+ ifstream F(string(InfoDir + "/info").c_str());
+ if (!F == 0)
+ getline(F,Name);
+
+ if (Name.empty() == false)
+ {
+ // Escape special characters
+ string::iterator J = Name.begin();
+ for (; J != Name.end(); J++)
+ if (*J == '"' || *J == ']' || *J == '[')
+ *J = '_';
+
+ if(log) {
+ msg.str("");
+ ioprintf(msg, "Found label '%s'\n", Name.c_str());
+ log->Update(msg.str());
+ }
+ Database.Set("CD::" + ID + "::Label",Name);
+ }
+ }
+
+ if (_config->FindB("APT::CDROM::Rename",false) == true ||
+ Name.empty() == true)
+ {
+ if(!log)
+ return _error->Error("No disc name found and no way to ask for it");
+
+ while(true) {
+ if(!log->AskCdromName(Name)) {
+ // user canceld
+ return false;
+ }
+ cout << "Name: '" << Name << "'" << endl;
+
+ if (Name.empty() == false &&
+ Name.find('"') == string::npos &&
+ Name.find('[') == string::npos &&
+ Name.find(']') == string::npos)
+ break;
+ log->Update(_("That is not a valid name, try again.\n"));
+ }
+ }
+ }
+ else
+ Name = Database.Find("CD::" + ID);
+
+ // Escape special characters
+ string::iterator J = Name.begin();
+ for (; J != Name.end(); J++)
+ if (*J == '"' || *J == ']' || *J == '[')
+ *J = '_';
+
+ Database.Set("CD::" + ID,Name);
+ if(log) {
+ msg.str("");
+ ioprintf(msg, _("This Disc is called: \n'%s'\n"), Name.c_str());
+ log->Update(msg.str());
+ }
+
+ log->Update(_("Copying package lists..."), STEP_COPY);
+ // take care of the signatures and copy them if they are ok
+ // (we do this before PackageCopy as it modifies "List" and "SourceList")
+ SigVerify SignVerify;
+ SignVerify.CopyAndVerify(CDROM, Name, SigList, List, SourceList);
+
+ // Copy the package files to the state directory
+ PackageCopy Copy;
+ SourceCopy SrcCopy;
+ if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
+ SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false)
+ return false;
+
+ // reduce the List so that it takes less space in sources.list
+ ReduceSourcelist(CDROM,List);
+ ReduceSourcelist(CDROM,SourceList);
+
+ // Write the database and sourcelist
+ if (_config->FindB("APT::cdrom::NoAct",false) == false)
+ {
+ if (WriteDatabase(Database) == false)
+ return false;
+
+ if(log) {
+ log->Update(_("Writing new source list\n"), STEP_WRITE);
+ }
+ if (WriteSourceList(Name,List,false) == false ||
+ WriteSourceList(Name,SourceList,true) == false)
+ return false;
+ }
+
+ // Print the sourcelist entries
+ if(log)
+ log->Update(_("Source List entries for this Disc are:\n"));
+
+ for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+ {
+ string::size_type Space = (*I).find(' ');
+ if (Space == string::npos)
+ return _error->Error("Internal error");
+
+ if(log) {
+ msg.str("");
+ msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) <<
+ " " << string(*I,Space+1) << endl;
+ log->Update(msg.str());
+ }
+ }
+
+ for (vector<string>::iterator I = SourceList.begin(); I != SourceList.end(); I++)
+ {
+ string::size_type Space = (*I).find(' ');
+ if (Space == string::npos)
+ return _error->Error("Internal error");
+
+ if(log) {
+ msg.str("");
+ msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) <<
+ " " << string(*I,Space+1) << endl;
+ log->Update(msg.str());
+ }
+ }
+
+
+
+ // Unmount and finish
+ if (_config->FindB("APT::CDROM::NoMount",false) == false) {
+ log->Update(_("Unmounting CD-ROM..."), STEP_LAST);
+ UnmountCdrom(CDROM);
+ }
+
+ return true;
+}
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
new file mode 100644
index 000000000..085eb64e2
--- /dev/null
+++ b/apt-pkg/cdrom.h
@@ -0,0 +1,71 @@
+#ifndef PKGLIB_CDROM_H
+#define PKGLIB_CDROM_H
+
+#include<apt-pkg/init.h>
+#include<string>
+#include<vector>
+
+#ifdef __GNUG__
+#pragma interface "apt-pkg/cdrom.h"
+#endif
+
+using namespace std;
+
+class pkgCdromStatus
+{
+ protected:
+ int totalSteps;
+
+ public:
+ pkgCdromStatus() {};
+ virtual ~pkgCdromStatus() {};
+
+ // total steps
+ virtual void SetTotal(int total) { totalSteps = total; };
+ // update steps, will be called regularly as a "pulse"
+ virtual void Update(string text="", int current=0) = 0;
+
+ // ask for cdrom insert
+ virtual bool ChangeCdrom() = 0;
+ // ask for cdrom name
+ virtual bool AskCdromName(string &Name) = 0;
+ // Progress indicator for the Index rewriter
+ virtual OpProgress* GetOpProgress() {return NULL; };
+};
+
+class pkgCdrom
+{
+ protected:
+ enum {
+ STEP_PREPARE = 1,
+ STEP_UNMOUNT,
+ STEP_WAIT,
+ STEP_MOUNT,
+ STEP_IDENT,
+ STEP_SCAN,
+ STEP_COPY,
+ STEP_WRITE,
+ STEP_UNMOUNT3,
+ STEP_LAST
+ };
+
+
+ bool FindPackages(string CD,vector<string> &List,
+ vector<string> &SList, vector<string> &SigList,
+ string &InfoDir, pkgCdromStatus *log,
+ unsigned int Depth = 0);
+ bool DropBinaryArch(vector<string> &List);
+ bool DropRepeats(vector<string> &List,const char *Name);
+ void ReduceSourcelist(string CD,vector<string> &List);
+ bool WriteDatabase(Configuration &Cnf);
+ bool WriteSourceList(string Name,vector<string> &List,bool Source);
+ int Score(string Path);
+
+ public:
+ bool Ident(string &ident, pkgCdromStatus *log);
+ bool Add(pkgCdromStatus *log);
+};
+
+
+
+#endif
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 7c9f5c0dd..92181472c 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -306,7 +306,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()
+pid_t ExecFork(int dontCloseThisFd)
{
// Fork off the process
pid_t Process = fork();
@@ -329,7 +329,8 @@ pid_t ExecFork()
// Close all of our FDs - just in case
for (int K = 3; K != 40; K++)
- fcntl(K,F_SETFD,FD_CLOEXEC);
+ if(K != dontCloseThisFd)
+ fcntl(K,F_SETFD,FD_CLOEXEC);
}
return Process;
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 041aa3309..4716e261e 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();
+pid_t ExecFork(int dontCloseThisFd=-1);
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
// File string manipulators
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index a22b4d2b2..9b402c523 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -343,11 +343,16 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
{
unsigned char Buf[64 * 64];
int Res = 0;
- while (Size != 0)
+ int ToEOF = (Size == 0);
+ while (Size != 0 || ToEOF)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned) Res != MIN(Size,sizeof(Buf)))
+ unsigned n = sizeof(Buf);
+ if (!ToEOF) n = MIN(Size,n);
+ Res = read(Fd,Buf,n);
+ if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
return false;
+ if (ToEOF && Res == 0) // EOF
+ break;
Size -= Res;
Add(Buf,Res);
}
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 85d46edba..61c48dcbb 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -326,7 +326,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
// DPkgPM::Go - Run the sequence /*{{{*/
// ---------------------------------------------------------------------
/* This globs the operations and calls dpkg */
-bool pkgDPkgPM::Go()
+bool pkgDPkgPM::Go(int status_fd)
{
unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);
unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
@@ -367,6 +367,17 @@ bool pkgDPkgPM::Go()
}
}
+ // 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]);
+ }
+
switch (I->Op)
{
case Item::Remove:
@@ -440,7 +451,11 @@ bool pkgDPkgPM::Go()
sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
// Fork dpkg
- pid_t Child = ExecFork();
+ pid_t Child;
+ if(status_fd > 0)
+ Child = ExecFork(status_fd);
+ else
+ Child = ExecFork();
// This is the child
if (Child == 0)
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 5d60b32d2..b59b9dc93 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -45,7 +45,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();
+ virtual bool Go(int status_fd=-1);
virtual void Reset();
public:
diff --git a/cmdline/indexcopy.cc b/apt-pkg/indexcopy.cc
index 0a3cd1575..901001891 100644
--- a/cmdline/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -18,8 +18,13 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/cdrom.h>
+#include <apti18n.h>
#include <iostream>
+#include <sstream>
#include <unistd.h>
#include <sys/stat.h>
#include <stdio.h>
@@ -30,12 +35,15 @@ using namespace std;
// IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
+bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
+ pkgCdromStatus *log)
{
+ OpProgress *Progress = NULL;
if (List.size() == 0)
return true;
- OpTextProgress Progress;
+ if(log)
+ Progress = log->GetOpProgress();
bool NoStat = _config->FindB("APT::CDROM::Fast",false);
bool Debug = _config->FindB("Debug::aptcdrom",false);
@@ -130,11 +138,13 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
return _error->Errno("fdopen","Failed to reopen fd");
// Setup the progress meter
- Progress.OverallProgress(CurrentSize,TotalSize,FileSize,
- string("Reading ") + Type() + " Indexes");
+ if(Progress)
+ Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
+ string("Reading ") + Type() + " Indexes");
// Parse
- Progress.SubProgress(Pkg.Size());
+ if(Progress)
+ Progress->SubProgress(Pkg.Size());
pkgTagSection Section;
this->Section = &Section;
string Prefix;
@@ -142,7 +152,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
unsigned long Chop = 0;
while (Parser.Step(Section) == true)
{
- Progress.Progress(Parser.Offset());
+ if(Progress)
+ Progress->Progress(Parser.Offset());
string File;
unsigned long Size;
if (GetFile(File,Size) == false)
@@ -230,35 +241,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
FinalF += URItoFileName(S);
if (rename(TargetF.c_str(),FinalF.c_str()) != 0)
return _error->Errno("rename","Failed to rename");
-
- // Copy the release file
- snprintf(S,sizeof(S),"cdrom:[%s]/%sRelease",Name.c_str(),
- (*I).c_str() + CDROM.length());
- string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
- TargetF += URItoFileName(S);
- if (FileExists(*I + "Release") == true)
- {
- FileFd Target(TargetF,FileFd::WriteEmpty);
- FileFd Rel(*I + "Release",FileFd::ReadOnly);
- if (_error->PendingError() == true)
- return false;
-
- if (CopyFile(Rel,Target) == false)
- return false;
- }
- else
- {
- // Empty release file
- FileFd Target(TargetF,FileFd::WriteEmpty);
- }
-
- // Rename the release file
- FinalF = _config->FindDir("Dir::State::lists");
- FinalF += URItoFileName(S);
- if (rename(TargetF.c_str(),FinalF.c_str()) != 0)
- return _error->Errno("rename","Failed to rename");
}
-
+
/* Mangle the source to be in the proper notation with
prefix dist [component] */
*I = string(*I,Prefix.length());
@@ -267,23 +251,30 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
CurrentSize += FileSize;
}
- Progress.Done();
+ if(Progress)
+ Progress->Done();
// Some stats
- cout << "Wrote " << Packages << " records" ;
- if (NotFound != 0)
- cout << " with " << NotFound << " missing files";
- if (NotFound != 0 && WrongSize != 0)
- cout << " and";
- if (WrongSize != 0)
- cout << " with " << WrongSize << " mismatched files";
- cout << '.' << endl;
+ if(log) {
+ stringstream msg;
+ if(NotFound == 0 && WrongSize == 0)
+ ioprintf(msg, _("Wrote %i records.\n"), Packages);
+ else if (NotFound != 0 && WrongSize == 0)
+ ioprintf(msg, _("Wrote %i records with %i missing files.\n"),
+ Packages, NotFound);
+ else if (NotFound == 0 && WrongSize != 0)
+ ioprintf(msg, _("Wrote %i records with %i mismachted files\n"),
+ Packages, WrongSize);
+ if (NotFound != 0 && WrongSize != 0)
+ ioprintf(msg, _("Wrote %i records with %i missing files and %i mismachted files\n"), Packages, NotFound, WrongSize);
+ }
if (Packages == 0)
_error->Warning("No valid records were found.");
if (NotFound + WrongSize > 10)
- cout << "Alot of entries were discarded, something may be wrong." << endl;
+ _error->Warning("Alot of entries were discarded, something may be wrong.\n");
+
return true;
}
@@ -521,4 +512,133 @@ bool SourceCopy::RewriteEntry(FILE *Target,string File)
fputc('\n',Target);
return true;
}
+
+
/*}}}*/
+
+bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
+{
+ const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
+
+ if (!Record)
+ {
+ _error->Warning("Can't find authentication record for: %s",file.c_str());
+ return false;
+ }
+
+ MD5Summation sum;
+ FileFd Fd(prefix+file, FileFd::ReadOnly);
+ sum.AddFD(Fd.Fd(), Fd.Size());
+ Fd.Close();
+ string MD5 = (string)sum.Result();
+
+ if (Record->MD5Hash != MD5)
+ {
+ _error->Warning("MD5 mismatch for: %s",file.c_str());
+ return false;
+ }
+
+ if(_config->FindB("Debug::aptcdrom",false))
+ {
+ cout << "File: " << prefix+file << endl;
+ cout << "Expected MD5sum: " << Record->MD5Hash << endl;
+ cout << "got: " << MD5 << endl << endl;
+ }
+
+ return true;
+}
+
+bool SigVerify::CopyMetaIndex(string CDROM, string CDName,
+ string prefix, string file)
+{
+ char S[400];
+ snprintf(S,sizeof(S),"cdrom:[%s]/%s%s",CDName.c_str(),
+ (prefix).c_str() + CDROM.length(),file.c_str());
+ string TargetF = _config->FindDir("Dir::State::lists");
+ TargetF += URItoFileName(S);
+
+ FileFd Target;
+ FileFd Rel;
+ Target.Open(TargetF,FileFd::WriteEmpty);
+ Rel.Open(prefix + file,FileFd::ReadOnly);
+ if (_error->PendingError() == true)
+ return false;
+ if (CopyFile(Rel,Target) == false)
+ return false;
+
+ return true;
+}
+
+bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
+ vector<string> PkgList,vector<string> SrcList)
+{
+ if (SigList.size() == 0)
+ return true;
+
+ bool Debug = _config->FindB("Debug::aptcdrom",false);
+
+ // Read all Release files
+ for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); I++)
+ {
+ if(Debug)
+ cout << "Signature verify for: " << *I << endl;
+
+ indexRecords *MetaIndex = new indexRecords;
+ string prefix = *I;
+
+ // a Release.gpg without a Release should never happen
+ if(!FileExists(*I+"Release"))
+ continue;
+
+
+ // verify the gpg signature of "Release"
+ // gpg --verify "*I+Release.gpg", "*I+Release"
+ string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
+ string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
+ pid_t pid = ExecFork();
+ if(pid < 0) {
+ _error->Error("Fork failed");
+ return false;
+ }
+ if(pid == 0) {
+ execlp(gpgvpath.c_str(), gpgvpath.c_str(), "--keyring",
+ pubringpath.c_str(), string(*I+"Release.gpg").c_str(),
+ string(*I+"Release").c_str(), NULL);
+ }
+ if(!ExecWait(pid, "gpgv")) {
+ _error->Warning("Signature verification failed for: %s",
+ string(*I+"Release.gpg").c_str());
+ // something went wrong, don't copy the Release.gpg
+ // FIXME: delete any existing gpg file?
+ continue;
+ }
+
+ // Open the Release file and add it to the MetaIndex
+ if(!MetaIndex->Load(*I+"Release"))
+ {
+ _error->Error(MetaIndex->ErrorText.c_str());
+ return false;
+ }
+
+ // go over the Indexfiles and see if they verify
+ // if so, remove them from our copy of the lists
+ vector<string> keys = MetaIndex->MetaKeys();
+ for (vector<string>::iterator I = keys.begin(); I != keys.end(); I++)
+ {
+ if(!Verify(prefix,*I, MetaIndex)) {
+ // something went wrong, don't copy the Release.gpg
+ // FIXME: delete any existing gpg file?
+ continue;
+ }
+ }
+
+ // we need a fresh one for the Release.gpg
+ delete MetaIndex;
+
+ // everything was fine, copy the Release and Release.gpg file
+ CopyMetaIndex(CDROM, Name, prefix, "Release");
+ CopyMetaIndex(CDROM, Name, prefix, "Release.gpg");
+ }
+
+ return true;
+}
diff --git a/cmdline/indexcopy.h b/apt-pkg/indexcopy.h
index e44a91727..fa8e9c156 100644
--- a/cmdline/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -19,6 +19,8 @@ using std::vector;
class pkgTagSection;
class FileFd;
+class indexRecords;
+class pkgCdromStatus;
class IndexCopy
{
@@ -39,7 +41,8 @@ class IndexCopy
public:
- bool CopyPackages(string CDROM,string Name,vector<string> &List);
+ bool CopyPackages(string CDROM,string Name,vector<string> &List,
+ pkgCdromStatus *log);
};
class PackageCopy : public IndexCopy
@@ -66,4 +69,15 @@ class SourceCopy : public IndexCopy
public:
};
+class SigVerify
+{
+ bool Verify(string prefix,string file, indexRecords *records);
+ bool CopyMetaIndex(string CDROM, string CDName,
+ string prefix, string file);
+
+ public:
+ bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
+ vector<string> PkgList,vector<string> SrcList);
+};
+
#endif
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index c4b8a8235..06ed7921c 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -83,6 +83,17 @@ bool indexRecords::Load(const string Filename)
return true;
}
+vector<string> indexRecords::MetaKeys()
+{
+ std::vector<std::string> keys;
+ std::map<string,checkSum *>::iterator I = Entries.begin();
+ while(I != Entries.end()) {
+ keys.push_back((*I).first);
+ ++I;
+ }
+ return keys;
+}
+
bool indexRecords::parseSumData(const char *&Start, const char *End,
string &Name, string &Hash, size_t &Size)
{
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 277280620..414faceaa 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
#include <map>
+#include <vector>
class indexRecords
{
@@ -34,7 +35,8 @@ class indexRecords
// Lookup function
virtual const checkSum *Lookup(const string MetaKey);
-
+ std::vector<std::string> MetaKeys();
+
virtual bool Load(string Filename);
string GetDist() const;
virtual bool CheckDist(const string MaybeDist) const;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index e62a7efd5..5f48f0f52 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,7 +13,7 @@ include ../buildlib/defaults.mak
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=3.7
+MAJOR=3.9
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
APT_DOMAIN:=libapt-pkg$(MAJOR)
@@ -34,14 +34,14 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \
acquire-worker.cc acquire-method.cc init.cc clean.cc \
srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
- indexrecords.cc vendor.cc vendorlist.cc
+ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc
HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
orderlist.h sourcelist.h packagemanager.h tagfile.h \
init.h pkgcache.h version.h progress.h pkgrecords.h \
acquire.h acquire-worker.h acquire-item.h acquire-method.h \
clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \
- vendorlist.h
+ vendorlist.h cdrom.h indexcopy.h
# Source code for the debian specific components
# In theory the deb headers do not need to be exported..
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index ba84c5ed7..43f2c4ace 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -68,7 +68,7 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
- virtual bool Go() {return true;};
+ virtual bool Go(int statusFd=-1) {return true;};
virtual void Reset() {};
public:
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 9ce898646..2578f9c6b 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -18,10 +18,13 @@
#include <apt-pkg/progress.h>
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/cdrom.h>
#include <config.h>
#include <apti18n.h>
-#include "indexcopy.h"
+//#include "indexcopy.h"
#include <locale.h>
#include <iostream>
@@ -37,460 +40,65 @@
using namespace std;
-// FindPackages - Find the package files on the CDROM /*{{{*/
-// ---------------------------------------------------------------------
-/* We look over the cdrom for package files. This is a recursive
- search that short circuits when it his a package file in the dir.
- This speeds it up greatly as the majority of the size is in the
- binary-* sub dirs. */
-bool FindPackages(string CD,vector<string> &List,vector<string> &SList,
- string &InfoDir,unsigned int Depth = 0)
+ /*{{{*/
+class pkgCdromTextStatus : public pkgCdromStatus
{
- static ino_t Inodes[9];
- if (Depth >= 7)
- return true;
-
- if (CD[CD.length()-1] != '/')
- CD += '/';
-
- if (chdir(CD.c_str()) != 0)
- return _error->Errno("chdir","Unable to change to %s",CD.c_str());
-
- // Look for a .disk subdirectory
- struct stat Buf;
- if (stat(".disk",&Buf) == 0)
- {
- if (InfoDir.empty() == true)
- InfoDir = CD + ".disk/";
- }
-
- // Don't look into directories that have been marked to ingore.
- if (stat(".aptignr",&Buf) == 0)
- return true;
-
- /* Aha! We found some package files. We assume that everything under
- this dir is controlled by those package files so we don't look down
- anymore */
- if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0)
- {
- List.push_back(CD);
-
- // Continue down if thorough is given
- if (_config->FindB("APT::CDROM::Thorough",false) == false)
- return true;
- }
- if (stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0)
- {
- SList.push_back(CD);
-
- // Continue down if thorough is given
- if (_config->FindB("APT::CDROM::Thorough",false) == false)
- return true;
- }
-
- DIR *D = opendir(".");
- if (D == 0)
- return _error->Errno("opendir","Unable to read %s",CD.c_str());
-
- // Run over the directory
- for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
- {
- // Skip some files..
- if (strcmp(Dir->d_name,".") == 0 ||
- strcmp(Dir->d_name,"..") == 0 ||
- //strcmp(Dir->d_name,"source") == 0 ||
- strcmp(Dir->d_name,".disk") == 0 ||
- strcmp(Dir->d_name,"experimental") == 0 ||
- strcmp(Dir->d_name,"binary-all") == 0 ||
- strcmp(Dir->d_name,"debian-installer") == 0)
- continue;
-
- // See if the name is a sub directory
- struct stat Buf;
- if (stat(Dir->d_name,&Buf) != 0)
- continue;
-
- if (S_ISDIR(Buf.st_mode) == 0)
- continue;
-
- unsigned int I;
- for (I = 0; I != Depth; I++)
- if (Inodes[I] == Buf.st_ino)
- break;
- if (I != Depth)
- continue;
-
- // Store the inodes weve seen
- Inodes[Depth] = Buf.st_ino;
-
- // Descend
- if (FindPackages(CD + Dir->d_name,List,SList,InfoDir,Depth+1) == false)
- break;
-
- if (chdir(CD.c_str()) != 0)
- return _error->Errno("chdir","Unable to change to %s",CD.c_str());
- };
-
- closedir(D);
-
- return !_error->PendingError();
-}
- /*}}}*/
-// DropBinaryArch - Dump dirs with a string like /binary-<foo>/ /*{{{*/
-// ---------------------------------------------------------------------
-/* Here we drop everything that is not this machines arch */
-bool DropBinaryArch(vector<string> &List)
+protected:
+ OpTextProgress Progress;
+ void Prompt(const char *Text);
+ string PromptLine(const char *Text);
+ bool AskCdromName(string &name);
+
+public:
+ virtual void Update(string text, int current);
+ virtual bool ChangeCdrom();
+ virtual OpProgress* GetOpProgress();
+};
+
+void pkgCdromTextStatus::Prompt(const char *Text)
{
- char S[300];
- snprintf(S,sizeof(S),"/binary-%s/",
- _config->Find("Apt::Architecture").c_str());
-
- for (unsigned int I = 0; I < List.size(); I++)
- {
- const char *Str = List[I].c_str();
-
- const char *Res;
- if ((Res = strstr(Str,"/binary-")) == 0)
- continue;
-
- // Weird, remove it.
- if (strlen(Res) < strlen(S))
- {
- List.erase(List.begin() + I);
- I--;
- continue;
- }
-
- // See if it is our arch
- if (stringcmp(Res,Res + strlen(S),S) == 0)
- continue;
-
- // Erase it
- List.erase(List.begin() + I);
- I--;
- }
-
- return true;
+ char C;
+ cout << Text << ' ' << flush;
+ read(STDIN_FILENO,&C,1);
+ if (C != '\n')
+ cout << endl;
}
- /*}}}*/
-// Score - We compute a 'score' for a path /*{{{*/
-// ---------------------------------------------------------------------
-/* Paths are scored based on how close they come to what I consider
- normal. That is ones that have 'dist' 'stable' 'testing' will score
- higher than ones without. */
-int Score(string Path)
+
+string pkgCdromTextStatus::PromptLine(const char *Text)
{
- int Res = 0;
- if (Path.find("stable/") != string::npos)
- Res += 29;
- if (Path.find("/binary-") != string::npos)
- Res += 20;
- if (Path.find("testing/") != string::npos)
- Res += 28;
- if (Path.find("unstable/") != string::npos)
- Res += 27;
- if (Path.find("/dists/") != string::npos)
- Res += 40;
- if (Path.find("/main/") != string::npos)
- Res += 20;
- if (Path.find("/contrib/") != string::npos)
- Res += 20;
- if (Path.find("/non-free/") != string::npos)
- Res += 20;
- if (Path.find("/non-US/") != string::npos)
- Res += 20;
- if (Path.find("/source/") != string::npos)
- Res += 10;
- if (Path.find("/debian/") != string::npos)
- Res -= 10;
+ cout << Text << ':' << endl;
+
+ string Res;
+ getline(cin,Res);
return Res;
}
- /*}}}*/
-// DropRepeats - Drop repeated files resulting from symlinks /*{{{*/
-// ---------------------------------------------------------------------
-/* Here we go and stat every file that we found and strip dup inodes. */
-bool DropRepeats(vector<string> &List,const char *Name)
+
+bool pkgCdromTextStatus::AskCdromName(string &name)
{
- // Get a list of all the inodes
- ino_t *Inodes = new ino_t[List.size()];
- for (unsigned int I = 0; I != List.size(); I++)
- {
- struct stat Buf;
- if (stat((List[I] + Name).c_str(),&Buf) != 0 &&
- stat((List[I] + Name + ".gz").c_str(),&Buf) != 0)
- _error->Errno("stat","Failed to stat %s%s",List[I].c_str(),
- Name);
- Inodes[I] = Buf.st_ino;
- }
-
- if (_error->PendingError() == true)
- return false;
-
- // Look for dups
- for (unsigned int I = 0; I != List.size(); I++)
- {
- for (unsigned int J = I+1; J < List.size(); J++)
- {
- // No match
- if (Inodes[J] != Inodes[I])
- continue;
-
- // We score the two paths.. and erase one
- int ScoreA = Score(List[I]);
- int ScoreB = Score(List[J]);
- if (ScoreA < ScoreB)
- {
- List[I] = string();
- break;
- }
+ cout << "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" << flush;
+ name = PromptLine("");
- List[J] = string();
- }
- }
-
- // Wipe erased entries
- for (unsigned int I = 0; I < List.size();)
- {
- if (List[I].empty() == false)
- I++;
- else
- List.erase(List.begin()+I);
- }
-
return true;
}
- /*}}}*/
-
-// ReduceSourceList - Takes the path list and reduces it /*{{{*/
-// ---------------------------------------------------------------------
-/* This takes the list of source list expressed entires and collects
- similar ones to form a single entry for each dist */
-void ReduceSourcelist(string CD,vector<string> &List)
-{
- sort(List.begin(),List.end());
- // Collect similar entries
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- {
- // Find a space..
- string::size_type Space = (*I).find(' ');
- if (Space == string::npos)
- continue;
- string::size_type SSpace = (*I).find(' ',Space + 1);
- if (SSpace == string::npos)
- continue;
- string Word1 = string(*I,Space,SSpace-Space);
- string Prefix = string(*I,0,Space);
- for (vector<string>::iterator J = List.begin(); J != I; J++)
- {
- // Find a space..
- string::size_type Space2 = (*J).find(' ');
- if (Space2 == string::npos)
- continue;
- string::size_type SSpace2 = (*J).find(' ',Space2 + 1);
- if (SSpace2 == string::npos)
- continue;
-
- if (string(*J,0,Space2) != Prefix)
- continue;
- if (string(*J,Space2,SSpace2-Space2) != Word1)
- continue;
-
- *J += string(*I,SSpace);
- *I = string();
- }
- }
-
- // Wipe erased entries
- for (unsigned int I = 0; I < List.size();)
- {
- if (List[I].empty() == false)
- I++;
- else
- List.erase(List.begin()+I);
- }
-}
- /*}}}*/
-// WriteDatabase - Write the CDROM Database file /*{{{*/
-// ---------------------------------------------------------------------
-/* We rewrite the configuration class associated with the cdrom database. */
-bool WriteDatabase(Configuration &Cnf)
+void pkgCdromTextStatus::Update(string text, int current)
{
- string DFile = _config->FindFile("Dir::State::cdroms");
- string NewFile = DFile + ".new";
-
- unlink(NewFile.c_str());
- ofstream Out(NewFile.c_str());
- if (!Out)
- return _error->Errno("ofstream::ofstream",
- "Failed to open %s.new",DFile.c_str());
-
- /* Write out all of the configuration directives by walking the
- configuration tree */
- const Configuration::Item *Top = Cnf.Tree(0);
- for (; Top != 0;)
- {
- // Print the config entry
- if (Top->Value.empty() == false)
- Out << Top->FullTag() + " \"" << Top->Value << "\";" << endl;
-
- if (Top->Child != 0)
- {
- Top = Top->Child;
- continue;
- }
-
- while (Top != 0 && Top->Next == 0)
- Top = Top->Parent;
- if (Top != 0)
- Top = Top->Next;
- }
-
- Out.close();
-
- rename(DFile.c_str(),string(DFile + '~').c_str());
- if (rename(NewFile.c_str(),DFile.c_str()) != 0)
- return _error->Errno("rename","Failed to rename %s.new to %s",
- DFile.c_str(),DFile.c_str());
-
- return true;
+ if(text.size() > 0)
+ cout << text << flush;
}
- /*}}}*/
-// WriteSourceList - Write an updated sourcelist /*{{{*/
-// ---------------------------------------------------------------------
-/* This reads the old source list and copies it into the new one. It
- appends the new CDROM entires just after the first block of comments.
- This places them first in the file. It also removes any old entries
- that were the same. */
-bool WriteSourceList(string Name,vector<string> &List,bool Source)
-{
- if (List.size() == 0)
- return true;
-
- string File = _config->FindFile("Dir::Etc::sourcelist");
-
- // Open the stream for reading
- ifstream F((FileExists(File)?File.c_str():"/dev/null"),
- ios::in );
- if (!F != 0)
- return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
-
- string NewFile = File + ".new";
- unlink(NewFile.c_str());
- ofstream Out(NewFile.c_str());
- if (!Out)
- return _error->Errno("ofstream::ofstream",
- "Failed to open %s.new",File.c_str());
- // Create a short uri without the path
- string ShortURI = "cdrom:[" + Name + "]/";
- string ShortURI2 = "cdrom:" + Name + "/"; // For Compatibility
-
- const char *Type;
- if (Source == true)
- Type = "deb-src";
- else
- Type = "deb";
-
- char Buffer[300];
- int CurLine = 0;
- bool First = true;
- while (F.eof() == false)
- {
- F.getline(Buffer,sizeof(Buffer));
- CurLine++;
- _strtabexpand(Buffer,sizeof(Buffer));
- _strstrip(Buffer);
-
- // Comment or blank
- if (Buffer[0] == '#' || Buffer[0] == 0)
- {
- Out << Buffer << endl;
- continue;
- }
-
- if (First == true)
- {
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- {
- string::size_type Space = (*I).find(' ');
- if (Space == string::npos)
- return _error->Error("Internal error");
- Out << Type << " cdrom:[" << Name << "]/" << string(*I,0,Space) <<
- " " << string(*I,Space+1) << endl;
- }
- }
- First = false;
-
- // Grok it
- string cType;
- string URI;
- const char *C = Buffer;
- if (ParseQuoteWord(C,cType) == false ||
- ParseQuoteWord(C,URI) == false)
- {
- Out << Buffer << endl;
- continue;
- }
-
- // Emit lines like this one
- if (cType != Type || (string(URI,0,ShortURI.length()) != ShortURI &&
- string(URI,0,ShortURI.length()) != ShortURI2))
- {
- Out << Buffer << endl;
- continue;
- }
- }
-
- // Just in case the file was empty
- if (First == true)
- {
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- {
- string::size_type Space = (*I).find(' ');
- if (Space == string::npos)
- return _error->Error("Internal error");
-
- Out << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) <<
- " " << string(*I,Space+1) << endl;
- }
- }
-
- Out.close();
-
- rename(File.c_str(),string(File + '~').c_str());
- if (rename(NewFile.c_str(),File.c_str()) != 0)
- return _error->Errno("rename","Failed to rename %s.new to %s",
- File.c_str(),File.c_str());
-
+bool pkgCdromTextStatus::ChangeCdrom()
+{
+ Prompt("Please insert a Disc in the drive and press enter");
return true;
}
- /*}}}*/
-// Prompt - Simple prompt /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void Prompt(const char *Text)
-{
- char C;
- cout << Text << ' ' << flush;
- read(STDIN_FILENO,&C,1);
- if (C != '\n')
- cout << endl;
-}
- /*}}}*/
-// PromptLine - Prompt for an input line /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string PromptLine(const char *Text)
-{
- cout << Text << ':' << endl;
-
- string Res;
- getline(cin,Res);
- return Res;
-}
+OpProgress* pkgCdromTextStatus::GetOpProgress()
+{
+ return &Progress;
+};
+
/*}}}*/
// DoAdd - Add a new CDROM /*{{{*/
@@ -501,186 +109,13 @@ string PromptLine(const char *Text)
verify them. Then rewrite the database files */
bool DoAdd(CommandLine &)
{
- // Startup
- string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
- if (CDROM[0] == '.')
- CDROM= SafeGetCWD() + '/' + CDROM;
-
- cout << "Using CD-ROM mount point " << CDROM << endl;
-
- // Read the database
- Configuration Database;
- string DFile = _config->FindFile("Dir::State::cdroms");
- if (FileExists(DFile) == true)
- {
- if (ReadConfigFile(Database,DFile) == false)
- return _error->Error("Unable to read the cdrom database %s",
- DFile.c_str());
- }
-
- // Unmount the CD and get the user to put in the one they want
- if (_config->FindB("APT::CDROM::NoMount",false) == false)
- {
- cout << "Unmounting CD-ROM" << endl;
- UnmountCdrom(CDROM);
-
- // Mount the new CDROM
- Prompt("Please insert a Disc in the drive and press enter");
- cout << "Mounting CD-ROM" << endl;
- if (MountCdrom(CDROM) == false)
- return _error->Error("Failed to mount the cdrom.");
- }
-
- // Hash the CD to get an ID
- cout << "Identifying.. " << flush;
- string ID;
- if (IdentCdrom(CDROM,ID) == false)
- {
- cout << endl;
- return false;
- }
-
- cout << '[' << ID << ']' << endl;
-
- cout << "Scanning Disc for index files.. " << flush;
- // Get the CD structure
- vector<string> List;
- vector<string> sList;
- string StartDir = SafeGetCWD();
- string InfoDir;
- if (FindPackages(CDROM,List,sList,InfoDir) == false)
- {
- cout << endl;
- return false;
- }
-
- chdir(StartDir.c_str());
-
- if (_config->FindB("Debug::aptcdrom",false) == true)
- {
- cout << "I found (binary):" << endl;
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- cout << *I << endl;
- cout << "I found (source):" << endl;
- for (vector<string>::iterator I = sList.begin(); I != sList.end(); I++)
- cout << *I << endl;
- }
-
- // Fix up the list
- DropBinaryArch(List);
- DropRepeats(List,"Packages");
- DropRepeats(sList,"Sources");
- cout << "Found " << List.size() << " package indexes and " << sList.size() <<
- " source indexes." << endl;
-
- if (List.size() == 0 && sList.size() == 0)
- return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc");
-
- // Check if the CD is in the database
- string Name;
- if (Database.Exists("CD::" + ID) == false ||
- _config->FindB("APT::CDROM::Rename",false) == true)
- {
- // Try to use the CDs label if at all possible
- if (InfoDir.empty() == false &&
- FileExists(InfoDir + "/info") == true)
- {
- ifstream F(string(InfoDir + "/info").c_str());
- if (!F == 0)
- getline(F,Name);
-
- if (Name.empty() == false)
- {
- // Escape special characters
- string::iterator J = Name.begin();
- for (; J != Name.end(); J++)
- if (*J == '"' || *J == ']' || *J == '[')
- *J = '_';
-
- cout << "Found label '" << Name << "'" << endl;
- Database.Set("CD::" + ID + "::Label",Name);
- }
- }
-
- if (_config->FindB("APT::CDROM::Rename",false) == true ||
- Name.empty() == true)
- {
- cout << "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'";
- while (1)
- {
- Name = PromptLine("");
- if (Name.empty() == false &&
- Name.find('"') == string::npos &&
- Name.find('[') == string::npos &&
- Name.find(']') == string::npos)
- break;
- cout << "That is not a valid name, try again " << endl;
- }
- }
- }
- else
- Name = Database.Find("CD::" + ID);
-
- // Escape special characters
- string::iterator J = Name.begin();
- for (; J != Name.end(); J++)
- if (*J == '"' || *J == ']' || *J == '[')
- *J = '_';
-
- Database.Set("CD::" + ID,Name);
- cout << "This Disc is called:" << endl << " '" << Name << "'" << endl;
-
- // Copy the package files to the state directory
- PackageCopy Copy;
- SourceCopy SrcCopy;
- if (Copy.CopyPackages(CDROM,Name,List) == false ||
- SrcCopy.CopyPackages(CDROM,Name,sList) == false)
- return false;
-
- ReduceSourcelist(CDROM,List);
- ReduceSourcelist(CDROM,sList);
-
- // Write the database and sourcelist
- if (_config->FindB("APT::cdrom::NoAct",false) == false)
- {
- if (WriteDatabase(Database) == false)
- return false;
-
- cout << "Writing new source list" << endl;
- if (WriteSourceList(Name,List,false) == false ||
- WriteSourceList(Name,sList,true) == false)
- return false;
- }
-
- // Print the sourcelist entries
- cout << "Source List entries for this Disc are:" << endl;
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- {
- string::size_type Space = (*I).find(' ');
- if (Space == string::npos)
- return _error->Error("Internal error");
-
- cout << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) <<
- " " << string(*I,Space+1) << endl;
- }
-
- for (vector<string>::iterator I = sList.begin(); I != sList.end(); I++)
- {
- string::size_type Space = (*I).find(' ');
- if (Space == string::npos)
- return _error->Error("Internal error");
-
- cout << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) <<
- " " << string(*I,Space+1) << endl;
- }
-
- cout << "Repeat this process for the rest of the CDs in your set." << endl;
-
- // Unmount and finish
- if (_config->FindB("APT::CDROM::NoMount",false) == false)
- UnmountCdrom(CDROM);
-
- return true;
+ bool res = false;
+ pkgCdromTextStatus log;
+ pkgCdrom cdrom;
+ res = cdrom.Add(&log);
+ if(res)
+ cout << "Repeat this process for the rest of the CDs in your set." << endl;
+ return res;
}
/*}}}*/
// DoIdent - Ident a CDROM /*{{{*/
@@ -688,38 +123,10 @@ bool DoAdd(CommandLine &)
/* */
bool DoIdent(CommandLine &)
{
- // Startup
- string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
- if (CDROM[0] == '.')
- CDROM= SafeGetCWD() + '/' + CDROM;
-
- cout << "Using CD-ROM mount point " << CDROM << endl;
- cout << "Mounting CD-ROM" << endl;
- if (MountCdrom(CDROM) == false)
- return _error->Error("Failed to mount the cdrom.");
-
- // Hash the CD to get an ID
- cout << "Identifying.. " << flush;
- string ID;
- if (IdentCdrom(CDROM,ID) == false)
- {
- cout << endl;
- return false;
- }
-
- cout << '[' << ID << ']' << endl;
-
- // Read the database
- Configuration Database;
- string DFile = _config->FindFile("Dir::State::cdroms");
- if (FileExists(DFile) == true)
- {
- if (ReadConfigFile(Database,DFile) == false)
- return _error->Error("Unable to read the cdrom database %s",
- DFile.c_str());
- }
- cout << "Stored Label: '" << Database.Find("CD::" + ID) << "'" << endl;
- return true;
+ string ident;
+ pkgCdromTextStatus log;
+ pkgCdrom cdrom;
+ return cdrom.Ident(ident, &log);
}
/*}}}*/
diff --git a/cmdline/makefile b/cmdline/makefile
index 21a6d47d4..882a0e1b5 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -30,7 +30,7 @@ include $(PROGRAM_H)
PROGRAM=apt-cdrom
SLIBS = -lapt-pkg
LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-cdrom.cc indexcopy.cc
+SOURCE = apt-cdrom.cc
include $(PROGRAM_H)
# The apt-sortpkgs program
diff --git a/configure.in b/configure.in
index b40a53b7f..6b57dec27 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.29")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.31")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 17fe8fb78..3e6b384d2 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -20,7 +20,6 @@ check_stamp()
stamp=$(date --date=$(date -r $stamp --iso-8601) +%s)
now=$(date --date=$(date --iso-8601) +%s)
delta=$(($now-$stamp))
- echo "stamp=$stamp, now=$now, delta=$delta"
if [ $delta -ge $interval ]; then
return 0
diff --git a/debian/changelog b/debian/changelog
index d0dae01d2..c384c399d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
+apt (0.6.31) hoary; urgency=low
+
+ * Matt Zimmerman
+ - Remove debugging output from apt.cron.daily (no one noticed?)
+ - Apply patch from Anthony Towns to allow SHA1Summation to process a file
+ descriptor until EOF, rather than requiring that the length of input be
+ specified (Closes: #291338)
+ - Fix build/install of Polish offline documentation, based on patch from
+ Christian Perrier (Closes: #270404)
+ * Michael Vogt
+ - apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library
+ apt-pkg/cdrom.{cc,h}) (Ubuntu #5668)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Fri, 4 Feb 2005 10:23:01 -0800
+
apt (0.6.30) unstable; urgency=low
* Add ppc64 to buildlib/archtable
-
- --
+ * Merge michael.vogt@canonical.com--2004/apt--status-fd--0
+ - Support preserving dpkg status file descriptor, to support
+ better integration with synaptic
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 19 Jan 2005 00:26:01 -0800
apt (0.6.29) hoary; urgency=low
diff --git a/debian/rules b/debian/rules
index b756b3b32..e3254c2d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,7 @@ apt-doc: build-doc
#
# Copy the guides
dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
- $(BLD)/docs/offline.text $(BLD)/docs/offline.html
+ $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html
dh_installchangelogs -p$@
dh_compress -p$@
dh_fixperms -p$@
diff --git a/doc/pl/offline.pl.sgml b/doc/pl/offline.pl.sgml
index 48f84e3b1..2adb2554d 100644
--- a/doc/pl/offline.pl.sgml
+++ b/doc/pl/offline.pl.sgml
@@ -1,80 +1,80 @@
<!doctype debiandoc system>
<!-- -*- mode: sgml; mode: fold -*- -->
<book>
-<title>Uywanie APT w trybie offline</title>
+<title>U�ywanie APT w trybie offline</title>
<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<author>Polskie tumaczenie Krzysztof Fiertek <email>akfedux@megapolis.pl</email></author>
+<author>Polskie t�umaczenie Krzysztof Fiertek <email>akfedux@megapolis.pl</email></author>
<version>$Id: offline.pl.sgml,v 1.1 2004/07/29 16:43:13 mdz Exp $</version>
<abstract>
-Dokument ten opisuje jak uywa programu APT w rodowiskach niesieciowych,
-a w szczeglnoci metod pozwalajc na robienie aktualizacji systemu.
+Dokument ten opisuje jak u�ywa� programu APT w �rodowiskach niesieciowych,
+a w szczeg�lno�ci metod� pozwalaj�c� na robienie aktualizacji systemu.
</abstract>
<copyright>
Copyright &copy; Jason Gunthorpe, 1999.
<p>
-Copyright &copy; polskiego tumaczenia Krzysztof Fiertek, 2004.
+Copyright &copy; polskiego t�umaczenia Krzysztof Fiertek, 2004.
<p>
-"APT" i ten dokument s oprogramowaniem wolnodostpnym; moesz
-rozpowszechnia je i/lub zmienia w zgodzie z postanowieniami
-"Oglnej Licencji Publicznej GNU" (GNU General Public License)
-takiej, jak zostaa opublikowana przez "Fundacje Wolnego
-Oprogramowania (Free Software Foundation); albo w wersji 2 teje
-licencji, albo (twj wybr) w dowolnej pniejszej.
+"APT" i ten dokument s� oprogramowaniem wolnodost�pnym; mo�esz
+rozpowszechnia� je i/lub zmienia� w zgodzie z postanowieniami
+"Og�lnej Licencji Publicznej GNU" (GNU General Public License)
+takiej, jak zosta�a opublikowana przez "Fundacje Wolnego
+Oprogramowania (Free Software Foundation); albo w wersji 2 tej�e
+licencji, albo (tw�j wyb�r) w dowolnej p��niejszej.
<p>
-Wicej szczegw moesz uzyska przegldajc plik zawierajcy peny tekst
+Wi�cej szczeg���w mo�esz uzyska� przegl�daj�c plik zawieraj�cy pe�ny tekst
licencji (w systemach Debian jest to plik /usr/doc/copyright/GPL).
</copyright
<toc sect>
-<chapt>Wstp
+<chapt>Wst�p
<!-- Overview {{{ -->
<!-- ===================================================================== -->
<sect>Wprowadzenie
<p>
-Normalnie APT wymaga bezporedniego dostpu do archiww Debiana poprzez
-sie lokaln albo przez sie internetow. Kolejn niedogodnoci moe by
-fakt, e nasz komputer, ktry pracuje na wolnym czu takim jak modem,
-jest znacznie oddalony od innnego komputera z szybkim czem.
+Normalnie APT wymaga bezpo�redniego dost�pu do archiw�w Debiana poprzez
+sie� lokaln� albo przez sie� internetow�. Kolejn� niedogodno�ci� mo�e by�
+fakt, �e nasz komputer, kt�ry pracuje na wolnym ��czu takim jak modem,
+jest znacznie oddalony od innnego komputera z szybkim ��czem.
<p>
-Rozwizaniem tego problemu jest uycie pojemnych przenonych nonikw
-takich jak dyskietka Zip lub dysk SuperDisk. Noniki te nie s
-wystarczajco pojemne, by zgromadzi kompletne archiwum Debiana, ale mona
-miao dopasowa podzbir duego archiwum wystarczajcy dla wikszoci
-uytkownikw. Pomys polega na tym, by uy programu APT do wygenerowania
-listy pakietw, ktre s wymagane, nastpnie pobraniu ich na dysk uywajc
-innego komputera z waciw zwartoci. Jest nawet moliwe, by uy innego
-komputera z Debianem z zainstalowanym programem APT lub zupenie innym
-systemem operacyjnym i programem narzdziowym do pobierania plikw takim
+Rozwi�zaniem tego problemu jest u�ycie pojemnych przeno�nych no�nik�w
+takich jak dyskietka Zip lub dysk SuperDisk. No�niki te nie s�
+wystarczaj�co pojemne, by zgromadzi� kompletne archiwum Debiana, ale mo�na
+�mia�o dopasowa� podzbi�r du�ego archiwum wystarczaj�cy dla wi�kszo�ci
+u�ytkownik�w. Pomys� polega na tym, by u�y� programu APT do wygenerowania
+listy pakiet�w, kt�re s� wymagane, nast�pnie pobraniu ich na dysk u�ywaj�c
+innego komputera z w�a�ciw� zwarto�ci�. Jest nawet mo�liwe, by u�y� innego
+komputera z Debianem z zainstalowanym programem APT lub zupe�nie innym
+systemem operacyjnym i programem narz�dziowym do pobierania plik�w takim
jak wget.
<p>
-Osignite jest to przez twrcze manipulowanie plikiem konfiguracyjnym
-programu APT. Rzecz niezbdn jest poinformowanie programu APT, aby wskazywa
-na dysk z plikami archiwum. Naley zauway, e dysk powinien by
-sformatowany do obsugi systemu plikw takiego jak ext2, fat32 albo vfat
-pozwalajcych posugiwa si dugimi nazwami pliku.
+Osi�gni�te jest to przez tw�rcze manipulowanie plikiem konfiguracyjnym
+programu APT. Rzecz� niezb�dn� jest poinformowanie programu APT, aby wskazywa�
+na dysk z plikami archiwum. Nale�y zauwa�y�, �e dysk powinien by�
+sformatowany do obs�ugi systemu plik�w takiego jak ext2, fat32 albo vfat
+pozwalaj�cych pos�ugiwa� si� d�ugimi nazwami pliku.
</sect>
<!-- }}} -->
-<chapt>Uywanie programu APT na obu komputerach
+<chapt>U�ywanie programu APT na obu komputerach
<!-- Overview {{{ -->
<!-- ===================================================================== -->
<sect>Wprowadzenie
<p>
-APT bdcy do dyspozycji na obu komputerach daje najprostsz kombinacj.
-Zasadniczym pomysem tej metody jest umieci kopie pliku status na dysku
-i uy odlegego komputera, aby uzyska najnowsze pliki pakietw
-i zdecydowa, ktre pakiety chcemy pobra. Struktura katalogw na dysku
-powinna wyglda nastpujco:
+APT b�d�cy do dyspozycji na obu komputerach daje najprostsz� kombinacj�.
+Zasadniczym pomys�em tej metody jest umie�ci� kopie pliku status na dysku
+i u�y� odleg�ego komputera, aby uzyska� najnowsze pliki pakiet�w
+i zdecydowa�, kt�re pakiety chcemy pobra�. Struktura katalog�w na dysku
+powinna wygl�da� nast�puj�co:
<example>
/disc/
@@ -94,21 +94,21 @@ powinna wyglda nastpujco:
<sect>Plik konfiguracyjny
<p>
-Plik konfiguracyjny powinien informowa program APT, aby przechowywa jego
-pliki na dysku, a take uywa plikw konfiguracyjnych z dysku. Plik
-sources.list powinien zawiera prawidowe odnoniki, ktrych oczekujesz
-uy od zdalnego komputera, a plik status powinien by kopi
-<em>/var/lib/dpkg/status</em>. Zauwa, e jeli uywasz lokalnego archiwum
-musisz uy tych samych odnonikw o identycznej skadni.
+Plik konfiguracyjny powinien informowa� program APT, aby przechowywa� jego
+pliki na dysku, a tak�e u�ywa� plik�w konfiguracyjnych z dysku. Plik
+sources.list powinien zawiera� prawid�owe odno�niki, kt�rych oczekujesz
+u�y� od zdalnego komputera, a plik status powinien by� kopi�
+<em>/var/lib/dpkg/status</em>. Zauwa�, �e je�li u�ywasz lokalnego archiwum
+musisz u�y� tych samych odno�nik�w o identycznej sk�adni.
<p>
-<em>apt.conf</em> musi zawiera niezbdne wpisy, by APT korzysta z dysku:
+<em>apt.conf</em> musi zawiera� niezb�dne wpisy, by APT korzysta� z dysku:
<example>
APT
{
- /* Ten wpis nie jest wymagany jeli oba komputery s tej samej
- architektury, mwi on APTowi na komputerze pobierajcym pakiety
+ /* Ten wpis nie jest wymagany je�li oba komputery s� tej samej
+ architektury, m�wi on APTowi na komputerze pobieraj�cym pakiety
jakiej architektury jest nasz komputer */
Architecture "i386";
@@ -117,12 +117,12 @@ musisz uy tych samych odnonikw o identycznej skadni.
Dir
{
- /* Uyj katalogu disc na informacje stanu i skieruj plik status
+ /* U�yj katalogu disc na informacje stanu i skieruj plik status
z /var/lib/dpkg default */
State "/disc/";
State::status "status";
- // Katalog lokalnie przechowywanych pakietw binarnych
+ // Katalog lokalnie przechowywanych pakiet�w binarnych
Cache::archives "/disc/archives/";
Cache "/tmp/";
@@ -131,15 +131,15 @@ musisz uy tych samych odnonikw o identycznej skadni.
};
</example>
-Wicej szczegw mona zobaczy w manualu apt.conf i w przykadowym pliku
+Wi�cej szczeg���w mo�na zobaczy� w manualu apt.conf i w przyk�adowym pliku
konfiguracyjnym <em>/usr/doc/apt/examples/apt.conf</em>.
<p>
-Pierwsz rzecz jaka naley zrobi na oddalonym komputerze z Debianem to
-zamontowa dysk i przekopiowa na niego plik <em>/var/lib/dpkg/status</em>.
-Potrzeba take utworzy stuktur katalogw przedstawion we Wprowadzeniu,
-<em>archives/partial/</em> i <em>lists/partial/</em>. Nastpnie niesiemy
-dysk do oddalonego komputera z szybkim czem i konfigurujemy plik
+Pierwsz� rzecz� jaka nale�y zrobi� na oddalonym komputerze z Debianem to
+zamontowa� dysk i przekopiowa� na niego plik <em>/var/lib/dpkg/status</em>.
+Potrzeba tak�e utworzy� stuktur� katalog�w przedstawion� we Wprowadzeniu,
+<em>archives/partial/</em> i <em>lists/partial/</em>. Nast�pnie niesiemy
+dysk do oddalonego komputera z szybkim ��czem i konfigurujemy plik
sources.list. Na oddalonym komputerze wykonujemy kolejno:
<example>
@@ -151,54 +151,54 @@ sources.list. Na oddalonym komputerze wykonujemy kolejno:
</example>
-Polecenie dist-upgrade mona zastpi kadym innym podstawowym poleceniem
-APT, w szczeglnoci dselect-upgrade. Moesz nawet uy APT jako metod
-dostpu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu
-twoich operacji wyborw z powrotem na lokalny komputer.
+Polecenie dist-upgrade mo�na zast�pi� ka�dym innym podstawowym poleceniem
+APT, w szczeg�lno�ci dselect-upgrade. Mo�esz nawet u�y� APT jako metod�
+dost�pu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu
+twoich operacji wybor�w z powrotem na lokalny komputer.
<p>
W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa
-niezbdne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do
+niezb�dne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do
siebie i wpisujemy:
<example>
# export APT_CONFIG="/disc/apt.conf"
# apt-get check
- [ APT tworzy lokaln kopi plikw cache ]
+ [ APT tworzy lokaln� kopi� plik�w cache ]
# apt-get --no-d -o dir::etc::status=/var/lib/dpkg/status dist-upgrade
- [ Moe te by inne polecenie programu APT ]
+ [ Mo�e te� by� inne polecenie programu APT ]
</example>
<p>
-Koniecznym jest do prawidowego dziaania podmieni plik status na lokalnej
-maszynie. To jest bardzo wane!
+Koniecznym jest do prawid�owego dzia�ania podmieni� plik status na lokalnej
+maszynie. To jest bardzo wa�ne!
<p>
-Jeli uywasz dselect moesz wykona bardzo ryzykown operacj skopiowania
-disc/status do /var/lib/dpkg/status tak, e wszystkie zmiany ktre
-dokonae na odlegym komputerze s uaktualnione. Mocno zalecam aby
-dokonywa doboru pakietw tylko na lokalnym komputerze, ale nie zawsze
-jest to moliwe. NIE podmieniaj pliku status jeli dpkg lub APT byy
-uruchamiane w midzyczasie!!
+Je�li u�ywasz dselect mo�esz wykona� bardzo ryzykown� operacj� skopiowania
+disc/status do /var/lib/dpkg/status tak, �e wszystkie zmiany kt�re
+dokona�e� na odleg�ym komputerze s� uaktualnione. Mocno zalecam aby
+dokonywa� doboru pakiet�w tylko na lokalnym komputerze, ale nie zawsze
+jest to mo�liwe. NIE podmieniaj pliku status je�li dpkg lub APT by�y
+uruchamiane w mi�dzyczasie!!
</sect>
<!-- }}} -->
-<chapt>Uywanie programw APT i wget
+<chapt>U�ywanie program�w APT i wget
<!-- Overview {{{ -->
<!-- ===================================================================== -->
<sect>Wprowadzenie
<p>
-<em>wget</em> jest popularnym i przenonym programem narzdziowym
-pobierania plikw, ktry dziaa na prawie kadym komputerze.
-W przeciwiestwie do metody opisanej powyej ta wymaga komputera z Debianem,
-ktry ju posiada list dostpnych pakietw.
+<em>wget</em> jest popularnym i przeno�nym programem narz�dziowym
+pobierania plik�w, kt�ry dzia�a na prawie ka�dym komputerze.
+W przeciwie�stwie do metody opisanej powy�ej ta wymaga komputera z Debianem,
+kt�ry ju� posiada list� dost�pnych pakiet�w.
<p>
-Naley stworzy katalog disc tylko na pakiety do pobrania z innego
-komputera. Uyta zostanie do tego opcja --print-uris programu apt-get,
-a nastpnie przygotujemy skrypt dla programu wget, ktry pobierze waciwe
+Nale�y stworzy� katalog disc tylko na pakiety do pobrania z innego
+komputera. U�yta zostanie do tego opcja --print-uris programu apt-get,
+a nast�pnie przygotujemy skrypt dla programu wget, kt�ry pobierze w�a�ciwe
pakiety.
</sect>
@@ -208,28 +208,28 @@ pakiety.
<sect>Kolejne kroki
<p>
-W odrnieniu od poprzedniej metody dziaania ta nie wymaga specjalnych
-plikw konfiguracyjnych. Uywamy jedynie podstawowych polece APT, by
-wygenerowa list plikw.
+W odr��nieniu od poprzedniej metody dzia�ania ta nie wymaga specjalnych
+plik�w konfiguracyjnych. U�ywamy jedynie podstawowych polece� APT, by
+wygenerowa� list� plik�w.
<example>
# apt-get dist-upgrade
- [ Wybierz no po znaku zachty, upewnij si czy to waciwy wybr ]
+ [ Wybierz no po znaku zach�ty, upewnij si� czy to w�a?ciwy wyb�r ]
# apt-get -qq --print-uris dist-upgrade > uris
# awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script
</example>
-Take inne opcje ni dist-upgrade mog tu by uyte, wczajc
+Tak�e inne opcje ni� dist-upgrade mog� tu by� u�yte, w��czaj�c
dselect-upgrade.
<p>
-Plik skryptu /disc/wget-script bdzie teraz zawiera list polece dla
-programu wget, ktry uruchomi w porzdku pobieranie potrzebnych archiww.
-Skrypt ten naley uruchomi w biecym katalogu o punkcie montowania disc
-tak aby tu zapisywa dane na dysku.
+Plik skryptu /disc/wget-script b�dzie teraz zawiera� list� polece� dla
+programu wget, kt�ry uruchomi w porz�dku pobieranie potrzebnych archiw�w.
+Skrypt ten nale�y uruchomi� w bie��cym katalogu o punkcie montowania disc
+tak aby tu zapisywa� dane na dysku.
<p>
-Na oddalonym komputerze naley wykona co takiego
+Na oddalonym komputerze nale�y wykona� co� takiego
<example>
# cd /disc
@@ -237,14 +237,14 @@ Na oddalonym komputerze naley wykona co takiego
[ czekaj.. ]
</example>
-Gdy archiwa zostay pobrane i dysk wrci do komputera z Debianem,
-instalowanie mona prowadzi dalej poleceniem,
+Gdy archiwa zosta�y pobrane i dysk wr�ci� do komputera z Debianem,
+instalowanie mo�na prowadzi� dalej poleceniem,
<example>
# apt-get -o dir::cache::archives="/disc/" dist-upgrade
</example>
-Ktre uyje pobrane uprzednio archiwa z dysku.
+Kt�re u�yje pobrane uprzednio archiwa z dysku.
</sect>
<!-- }}} -->
</book>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index b9148fe16..9dd07fa59 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -146,7 +146,7 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 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
#, c-format
@@ -1495,7 +1495,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr ""
@@ -1895,54 +1895,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr ""
@@ -2291,3 +2291,93 @@ msgstr ""
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
+
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:728
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 752712e37..9411d463a 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -145,14 +145,14 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -242,7 +242,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -436,7 +436,12 @@ msgstr ""
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr ""
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr ""
@@ -530,7 +535,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -605,110 +610,123 @@ msgid ""
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Ispravljam zavisnosti..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Ne mogu ispraviti zavisnosti"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Urađeno"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Da, uradi kako kažem!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -716,74 +734,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Odustani."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Odustajem od instalacije."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr "[Instalirano]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -791,79 +809,79 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -871,149 +889,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, 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:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1137,23 +1155,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Sastavljam dostupne informacije"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Ne mogu izvršiti gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Oštećena arhiva"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
@@ -1298,8 +1316,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Čitam spiskove paketa"
@@ -1376,30 +1394,30 @@ msgstr ""
msgid "Error parsing MD5. Offset %lu"
msgstr ""
-#: 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 ""
-#: apt-inst/deb/debfile.cc:72
+#: apt-inst/deb/debfile.cc:52
#, c-format
-msgid "Internal Error, could not locate member %s"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr ""
@@ -1491,7 +1509,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr "Server je zatvorio vezu"
-#: 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 "Greška pri čitanju"
@@ -1581,7 +1599,7 @@ msgstr ""
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr ""
@@ -1725,6 +1743,14 @@ msgstr "Povezivanje neuspješno"
msgid "Internal error"
msgstr "Unutrašnja greška"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr ""
@@ -1884,54 +1910,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr ""
@@ -2017,76 +2043,66 @@ msgstr "Verzije kandidata"
msgid "Dependency Generation"
msgstr "Stvaranje zavisnosti"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr ""
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2100,19 +2116,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: 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 ""
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2150,7 +2166,7 @@ msgstr ""
msgid "Unable to stat %s."
msgstr ""
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
@@ -2250,47 +2266,136 @@ msgstr ""
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:718
#, 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:388
+#: apt-pkg/acquire-item.cc:771
#, 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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: methods/rsh.cc:264
-msgid "File Not Found"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Čekam na zaglavlja"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/cdrom.cc:728
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 631036505..71e1b1b06 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.27\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-08-09 18:45+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -148,14 +148,14 @@ msgstr " Taula de versió:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -291,7 +291,7 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -523,7 +523,12 @@ msgstr " %s no té una entrada dominant\n"
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+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"
@@ -617,7 +622,7 @@ msgstr "Ha fallat el reomenament de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilació de l'expressió regular - %s"
@@ -693,110 +698,123 @@ msgstr ""
"ATENCIÓ: 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:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instal·lar, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstal·lats, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a eliminar i %lu no actualitzats.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instal·lats o eliminats completament.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "S'estan corregint les dependències..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " falla."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "No es poden corregir les dependències"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "No es pot minimitzar el joc de versions revisades"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Fet"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Dependències sense satisfer. Proveu-ho usant -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "S'actualitzaran els següents paquets:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: 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"
+
+#: 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:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: 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."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es necessita obtenir %sB d'arxius.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Hi ha problemes i -y fou usat sense --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Sí, fes el que et dic!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -807,28 +825,28 @@ msgstr ""
"Per a continuar escriviu en la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Avortat."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Voleu continuar? [S/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de sols descàrrega"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -836,49 +854,49 @@ msgstr ""
"No es poden descarregar alguns arxius, potser executant apt-get update o "
"intenteu-ho amb --fix-missing."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "No es poden corregir els paquets que falten."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "S'està avortant la instal·lació."
-#: cmdline/apt-get.cc:979
+#: 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"
-#: cmdline/apt-get.cc:989
+#: 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"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquet %s és un paquet virtual proveït per:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Instal·lat]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -889,50 +907,50 @@ msgstr ""
"en fa referència. Això normalment vol dir que el paquet falta,\n"
"s'ha tornat obsolet o només és disponible des d'una altra font.\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Tot i que els següents paquets el reemplacen:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquet %s no té candidat d'instal·lació"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ja es troba en la versió més recent.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -940,25 +958,25 @@ msgstr ""
"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc "
"s'han usat els antics."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -966,7 +984,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -978,7 +996,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -988,108 +1006,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:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, 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:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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"
+msgstr ""
+"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1098,7 +1117,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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1107,32 +1126,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:2190
+#: cmdline/apt-get.cc:2243
#, 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"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falla al satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1313,23 +1332,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "S'està fusionant la informació disponible"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "No es poden crear els conductes"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "No es pot executar el gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Arxiu corromput"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
@@ -1476,8 +1495,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "S'està llegint la llista de paquets"
@@ -1557,30 +1576,30 @@ msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Error analitzant la suma MD5. Desplaçament %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 "Aquest no és un arxiu DEB vàlid, falta el membre '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Error intern, no s'ha pogut localitzar al membre %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 "Aquest no és un arxiu DEB vàlid, falta el membre '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "No s'ha pogut canviar a %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Error intern, no s'ha pogut localitzar al membre"
-#: apt-inst/deb/debfile.cc:158
+#: 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"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Fitxer de control incoherent"
@@ -1676,7 +1695,7 @@ msgstr "Temps de connexió finalitzat"
msgid "Server closed the connection"
msgstr "El servidor ha tancat la connexió"
-#: 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 "Error de lectura"
@@ -1766,7 +1785,7 @@ msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "No es pot invocar"
@@ -1910,6 +1929,14 @@ msgstr "Ha fallat la connexió"
msgid "Internal error"
msgstr "Error intern"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Fitxer no trobat"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "La connexió s'ha tancat prematurament"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "No es pot transferir un fitxer buit a memòria"
@@ -2069,54 +2096,54 @@ msgstr "No s'usen blocats per al fitxer de blocat %s de muntar nfs"
msgid "Could not get lock %s"
msgstr "No s'ha pogut blocar %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
-#: apt-pkg/contrib/fileutl.cc:368
+#: 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ó."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-procés %s ha retornat un codi d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-procés %s ha eixit inesperadament"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "No s'ha pogut obrir el fitxer %s"
-#: 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 "llegits, falten %lu per llegir, però no queda res"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Error d'escriptura"
-#: 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 "escrits, falten %lu per escriure però no s'ha pogut"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Ha hagut un problema en tancar el fitxer"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Ha hagut un problema en desenllaçar el fitxer"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
@@ -2201,77 +2228,66 @@ msgstr "Versions candidates"
msgid "Dependency Generation"
msgstr "Dependències que genera"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "No es pot analitzar el fitxer del paquet %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "El camp del proveïdor %s no és vàlid"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-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"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2289,14 +2305,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "El tipus de fitxer índex '%s', no està suportat"
-#: 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 ""
"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2304,7 +2320,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets mantinguts."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets mantinguts que estan "
@@ -2344,7 +2360,7 @@ msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
msgid "Unable to stat %s."
msgstr "No es pot veure l'estat de %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
@@ -2450,16 +2466,20 @@ msgstr "No s'ha pogut llegir la llista de paquets font %s"
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falla de renomenat, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Suma MD5 diferent"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2469,7 +2489,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2478,7 +2498,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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2486,21 +2506,111 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Mida diferent"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Suma MD5 diferent"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El camp del proveïdor %s no és vàlid"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Fitxer no trobat"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "La connexió s'ha tancat prematurament"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "S'estan esperant les capçaleres"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "S'està llegint la llista de paquets"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "La línia %u és massa llarga en la llista de fonts %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ 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"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
diff --git a/po/cs.po b/po/cs.po
index 8b4a3af19..c69c6d3ce 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-12 10:04+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <provoz@debian.cz>\n"
@@ -145,14 +145,14 @@ msgstr " Tabulka verzí:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -286,7 +286,7 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Nemohu zapsat do %s"
@@ -517,7 +517,12 @@ msgstr " %s nemá žádnou položku pro override\n"
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Vnitřní chyba, nemohu najít část %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Selhal pokus o přidělení paměti"
@@ -611,7 +616,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -687,110 +692,123 @@ msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalováno, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Opravuji závislosti..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " selhalo."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Nemohu opravit závislosti"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Nemohu minimalizovat sadu pro aktualizaci"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Pro opravení můžete spustit `apt-get -f install'."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplněné závislosti. Zkuste použít -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Následující balíky budou aktualizovány:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
+
+#: cmdline/apt-get.cc:762
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:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB archívů.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potřebuji stáhnout %sB archívů.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ano, udělej to tak, jak říkám!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -801,28 +819,28 @@ msgstr ""
"Pro pokračování opište frázi '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Přerušeno."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Chcete pokračovat? [Y/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -830,47 +848,47 @@ msgstr ""
"Nemohu stáhnout některé archívy. Možná spusťte apt-get update nebo zkuste --"
"fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Nemohu opravit chybějící balíky."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Přerušuji instalaci."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Pozn: Vybírám %s místo %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuální balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr "[Instalovaný]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Měli byste explicitně vybrat jeden k instalaci."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -881,49 +899,49 @@ msgstr ""
"To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
"pouze z jiného zdroje\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Nicméně následující balíky jej nahrazují:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta pro instalaci"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je již nejnovější verze.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Vydání '%s' pro '%s' nebylo nalezeno"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verze '%s' pro '%s' nebyla nalezena"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -931,25 +949,25 @@ msgstr ""
"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
"použity starší verze."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -957,7 +975,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -968,7 +986,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -978,114 +996,114 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Následujcící extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Propočítávám aktualizaci..."
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, 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:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Stažení některých archívů selhalo."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, 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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1094,31 +1112,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1292,23 +1310,23 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
msgid "Merging Available information"
msgstr "Slučuji dostupné informace"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Selhalo vytvoření roury"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Selhalo spuštění gzipu "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Porušený archív"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Kontrolní součet taru selhal, archív je poškozený"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznámá hlavička TARu typ %u, člen %s"
@@ -1453,8 +1471,8 @@ msgstr "Adresáře info a temp musí být na stejném souborovém systému"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Čtu seznamy balíků"
@@ -1534,30 +1552,30 @@ msgstr "Špatná sekce ConfFile ve stavovém souboru na pozici %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Chyba při zpracování MD5. Offset %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 "Toto není platný DEB archív, chybí část '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Vnitřní chyba, nemohu najít část %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 "Toto není platný DEB archív, chybí část '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Nemohu přejít do %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Vnitřní chyba, nemohu nalézt člen"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Nelze najít platný kontrolní soubor"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Nezpracovatelný kontrolní soubor"
@@ -1653,7 +1671,7 @@ msgstr "Čas spojení vypršel"
msgid "Server closed the connection"
msgstr "Server uzavřel spojení"
-#: 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 "Chyba čtení"
@@ -1742,7 +1760,7 @@ msgstr "Přenos dat selhal, server řekl '%s'"
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Nemohu vyvolat "
@@ -1886,6 +1904,14 @@ msgstr "Spojení selhalo"
msgid "Internal error"
msgstr "Vnitřní chyba"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Soubor nebyl nalezen"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Spojení bylo předčasně ukončeno"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Nemohu provést mmap prázdného souboru"
@@ -2046,54 +2072,54 @@ msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs"
msgid "Could not get lock %s"
msgstr "Nemohu získat zámek %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s obdržel chybu segmentace."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočekávaně skončil"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Nemohu otevřít soubor %s"
-#: 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 "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Chyba zápisu"
-#: 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 "zápis, stále mám %lu k zápisu, ale nejde to"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problém při zavírání souboru"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problém při odstraňování souboru"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
@@ -2178,76 +2204,66 @@ msgstr "Kandidátské verze"
msgid "Dependency Generation"
msgstr "Generování závislostí"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nelze zpracovat soubor %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Blok výrobce %s je neplatný"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Neznámé ID výrobce '%s' na řádce %u v seznamu zdrojů %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2264,13 +2280,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ souboru '%s' není podporován"
-#: 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 "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archív."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2278,7 +2294,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu."
@@ -2316,7 +2332,7 @@ msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
msgid "Unable to stat %s."
msgstr "Nebylo možno vyhodnotit %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Do sources.list musíte zadat 'zdrojové' URI"
@@ -2419,16 +2435,20 @@ msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Neshoda MD5 součtů"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2437,7 +2457,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2446,25 +2466,114 @@ 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:419
+#: apt-pkg/acquire-item.cc:807
#, 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:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Neshoda MD5 součtů"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobce %s je neplatný"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Soubor nebyl nalezen"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Spojení bylo předčasně ukončeno"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Čekám na hlavičky"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Čtu seznamy balíků"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Neznámé ID výrobce '%s' na řádce %u v seznamu zdrojů %s"
diff --git a/po/da.po b/po/da.po
index e8ae217a7..f0f81c34a 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-09-01 13:42+0200\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -151,14 +151,14 @@ msgstr " Versionstabel:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -293,7 +293,7 @@ msgstr ""
" -c=? Ls denne opstningsfil\n"
" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -523,7 +523,12 @@ msgstr " %s har ingen tvangs-post\n"
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Intern fejl, kunne ikke finde elementet %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Kunne ikke allokere hukommelse"
@@ -617,7 +622,7 @@ msgstr "Kunne ikke omdbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
@@ -693,110 +698,123 @@ msgstr ""
"ADVARSEL: Flgende essentielle pakker vil blive fjernet\n"
"Dette br IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderede, %lu netop installerede, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstallerede, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderede, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu at fjerne og %lu ikke opgraderede.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstndigt installerede eller fjernede.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Retter afhngigheder..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " mislykkedes."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Kunne ikke rette afhngigheder"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Kunne ikke minimere opgraderingssttet"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Uopfyldte afhngigheder. Prv med -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Flgende pakker vil blive opgraderet:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Der er problemer og -y blev brugt uden --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pakker skal fjernes, men Remove er deaktiveret."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Der er problemer og -y blev brugt uden --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ja, gr som jeg siger!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -807,28 +825,28 @@ msgstr ""
"For at fortstte, skal du skrive '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Afbryder."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Vil du fortstte? [J/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -836,49 +854,49 @@ msgstr ""
"Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' "
"eller prv med --fix-missing."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og medieskift understttes endnu ikke"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Kunne ikke rette manglende pakker."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Afbryder installationen."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Bemrk, at %s vlges fremfor %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Overspringer %s, da den allerede er installeret og opgradering er "
"deaktiveret.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikke installeret, s den fjernes ikke\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Installeret]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Du br eksplicit vlge en at installere."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -889,49 +907,49 @@ msgstr ""
"anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n"
"kun kan hentes fra andre kilder\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Dog kan flgende pakker erstatte den:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er i forvejen den nyeste version.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Udgaven '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -939,25 +957,25 @@ msgstr ""
"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
"bruges i stedet."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -965,7 +983,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -976,7 +994,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -985,112 +1003,113 @@ 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:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
+msgstr ""
+"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1099,32 +1118,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,33 +1310,36 @@ msgstr "pakker, der blev installeret. Det kan give gentagne fejl"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "eller fejl, der skyldes manglende afhngigheder. Dette er o.k. Det er kun"
+msgstr ""
+"eller fejl, der skyldes manglende afhngigheder. Dette er o.k. Det er kun"
#: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
-msgstr "fejlene over denne besked, der er vigtige. Ret dem og kr [I]nstallr igen"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"fejlene over denne besked, der er vigtige. Ret dem og kr [I]nstallr igen"
#: dselect/update:30
msgid "Merging Available information"
msgstr "Sammenfletter tilgngelighedsoplysninger"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Kunne ikke oprette viderefrsler"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Kunne ikke udfre gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "delagt arkiv"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar-tjeksum fejlede, arkivet er delagt"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukendt TAR-hovedtype %u, element %s"
@@ -1462,8 +1484,8 @@ msgstr "Mapperne info og temp skal ligge i samme filsystem"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Indlser pakkelisterne"
@@ -1543,30 +1565,30 @@ msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Fejl under tolkning af MD5. Forskydning %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 "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Intern fejl, kunne ikke finde elementet %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 "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Kunne ikke skifte til %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Intern fejl, kunne ikke finde element"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Kunne ikke finde en gyldig kontrolfil"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Ikke-tolkbar kontrolfil"
@@ -1662,7 +1684,7 @@ msgstr "Tidsudlb p forbindelsen"
msgid "Server closed the connection"
msgstr "Serveren lukkede forbindelsen"
-#: 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 "Lsefejl"
@@ -1751,7 +1773,7 @@ msgstr "Dataoverfrsel mislykkedes, serveren sagde '%s'"
msgid "Query"
msgstr "Foresprgsel"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Kunne ikke udfre "
@@ -1849,7 +1871,8 @@ msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
#: methods/http.cc:570
msgid "This http server has broken range support"
-msgstr "Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
+msgstr ""
+"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
#: methods/http.cc:594
msgid "Unknown date format"
@@ -1895,6 +1918,14 @@ msgstr "Forbindelsen mislykkedes"
msgid "Internal error"
msgstr "Intern fejl"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Fil blev ikke fundet"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Forbindelsen lukkedes for hurtigt"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Kan ikke udfre mmap for en tom fil"
@@ -2054,54 +2085,54 @@ msgstr "Benytter ikke lsning for nfs-monteret lsefil %s"
msgid "Could not get lock %s"
msgstr "Kunne ikke opn lsen %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Ventede p %s, men den var der ikke"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprocessen %s modtog en segmenteringsfejl."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerede en fejlkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s afsluttedes uventet"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke bne filen %s"
-#: 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 "ls, mangler stadig at lse %lu men der er ikke flere"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Skrivefejl"
-#: 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 "skriv, mangler stadig at skrive %lu men kunne ikke"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problem under lukning af fil"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Fejl ved frigivelse af filen"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
@@ -2186,76 +2217,66 @@ msgstr "Kandidatversioner"
msgid "Dependency Generation"
msgstr "Afhngighedsgenerering"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kunne ikke tolke pakkefilen %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI parse)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (Absolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Leverandrblok %s er ugyldig"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "bner %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s"
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Ugyldig linje %u i kildelisten %s (vendor id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Ukendt leverandr-ID '%s' p linje %u i kildelisten %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2272,12 +2293,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiler af typen '%s' understttes ikke"
-#: 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 "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2285,9 +2308,10 @@ msgstr ""
"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
"tilbageholdte pakker."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker."
+msgstr ""
+"Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker."
#: apt-pkg/acquire.cc:61
#, c-format
@@ -2323,7 +2347,7 @@ msgstr "Kunne ikke bestemme en passende pakkesystemtype"
msgid "Unable to stat %s."
msgstr "Kunne ikke finde %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Du skal have nogle 'source'-URI'er i din sources.list"
@@ -2389,7 +2413,8 @@ msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere."
+msgstr ""
+"Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere."
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
@@ -2397,7 +2422,8 @@ msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere."
+msgstr ""
+"Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere."
#: apt-pkg/pkgcachegen.cc:241
#, c-format
@@ -2423,16 +2449,20 @@ msgstr "Kunne ikke finde kildepakkelisten %s"
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum stemmer ikke"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2441,7 +2471,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2450,26 +2480,122 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, 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 "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum stemmer ikke"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Leverandrblok %s er ugyldig"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Fil blev ikke fundet"
+#: apt-pkg/cdrom.cc:487
+#, fuzzy, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr "Bruger cdrom-monteringspunkt "
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr "Identificerer.. "
+
+#: apt-pkg/cdrom.cc:521
+#, fuzzy, c-format
+msgid "Stored Label: %s \n"
+msgstr "Gemt mrkat: '"
+
+#: apt-pkg/cdrom.cc:541
+#, fuzzy, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Bruger cdrom-monteringspunkt "
+
+#: apt-pkg/cdrom.cc:559
+#, fuzzy
+msgid "Unmounting CD-ROM\n"
+msgstr "Afmonterer cdrom"
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Afventer hoveder"
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Forbindelsen lukkedes for hurtigt"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Mounting CD-ROM...\n"
+msgstr "Monterer cdrom"
+
+#: apt-pkg/cdrom.cc:589
+#, fuzzy
+msgid "Scanning Disc for index files..\n"
+msgstr "Skanner disken for indeksfiler.. "
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+#, fuzzy
+msgid "That is not a valid name, try again.\n"
+msgstr "Det er ikke et gyldigt navn, prv igen "
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "Denne disk hedder:"
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Indlser pakkelisterne"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Skriver ny kildeliste"
+
+#: apt-pkg/cdrom.cc:737
+#, fuzzy
+msgid "Source List entries for this Disc are:\n"
+msgstr "Kildeliste-indgangene er for denne disk:"
+
+#: apt-pkg/cdrom.cc:771
+#, fuzzy
+msgid "Unmounting CD-ROM..."
+msgstr "Afmonterer cdrom"
+
+#: 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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Ukendt leverandr-ID '%s' p linje %u i kildelisten %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2557,24 +2683,9 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Kunne ikke omdbe %s.new til %s"
-#~ msgid "Using CD-ROM mount point "
-#~ msgstr "Bruger cdrom-monteringspunkt "
-
-#~ msgid "Unmounting CD-ROM"
-#~ msgstr "Afmonterer cdrom"
-
#~ msgid "Please insert a Disc in the drive and press enter"
#~ msgstr "Indst en disk i drevet og tryk retur"
-#~ msgid "Mounting CD-ROM"
-#~ msgstr "Monterer cdrom"
-
-#~ msgid "Identifying.. "
-#~ msgstr "Identificerer.. "
-
-#~ msgid "Scanning Disc for index files.. "
-#~ msgstr "Skanner disken for indeksfiler.. "
-
#~ msgid "I found (binary):"
#~ msgstr "Jeg fandt (binre programfiler):"
@@ -2595,27 +2706,12 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
#~ msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
-#~ msgid "That is not a valid name, try again "
-#~ msgstr "Det er ikke et gyldigt navn, prv igen "
-
-#~ msgid "This Disc is called:"
-#~ msgstr "Denne disk hedder:"
-
#~ msgid " '"
#~ msgstr " '"
-#~ msgid "Writing new source list"
-#~ msgstr "Skriver ny kildeliste"
-
-#~ msgid "Source List entries for this Disc are:"
-#~ msgstr "Kildeliste-indgangene er for denne disk:"
-
#~ msgid "Repeat this process for the rest of the CDs in your set."
#~ msgstr "Gentag processen for resten af cd'erne i dit st."
-#~ msgid "Stored Label: '"
-#~ msgstr "Gemt mrkat: '"
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
@@ -2769,4 +2865,3 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgid "Errors apply to file '%s'"
#~ msgstr "Fejlene vedrrer filen '%s'"
-
diff --git a/po/de.UTF-8.po b/po/de.UTF-8.po
index 4e88dacd9..22eb4ae33 100644
--- a/po/de.UTF-8.po
+++ b/po/de.UTF-8.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-08-04 15:58 +0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -146,14 +146,14 @@ msgstr " Versions-Tabelle:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -293,7 +293,7 @@ msgstr ""
" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kann nicht nach %s schreiben"
@@ -531,7 +531,12 @@ msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Maintainer ist %s und nicht %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Interner Fehler, konnte Bestandteil %s nicht finden"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Speicheranforderung fehlgeschlagen"
@@ -625,7 +630,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -701,112 +706,125 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Die sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Abhängigkeit werden korrigiert..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " fehlgeschlagen."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Kann Abhängigkeiten nicht korrigieren"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Fertig"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Die folgenden Pakete werden aktualisiert:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es müssen %sB Archive geholt werden.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben sein.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "„Nur triviale“ angegeben, aber das ist keine triviale Operation."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -817,28 +835,28 @@ msgstr ""
"Zum Fortfahren geben Sie bitte „%s“ ein.\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abbruch."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Möchten Sie fortfahren? [J/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -846,48 +864,48 @@ msgstr ""
"Konnte einige Archive nicht herunterladen, vielleicht „apt-get update“ oder "
"mit „--fix-missing“ probieren?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Konnte fehlende Pakete nicht korrigieren."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Installation abgebrochen."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Achtung, wähle %s an Stelle von %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Überspringe %s, es ist schon installiert und „upgrade“ ist nicht gesetzt.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Installiert]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Sie sollten eines explizit zum Installieren auswählen."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -898,51 +916,51 @@ msgstr ""
"Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
"ist oder nur aus einer anderen Quelle verfügbar ist.\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Doch die folgenden Pakete ersetzen es:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s hat keinen Installationskandidaten"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Re-Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ist schon die neueste Version.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release „%s“ für „%s“ konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version „%s“ für „%s“ konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Der Befehl „update“ nimmt keine Argumente"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -950,27 +968,27 @@ msgstr ""
"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
"ignoriert oder alte an ihrer Stelle benutzt."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -978,7 +996,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:1477
+#: cmdline/apt-get.cc:1530
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 +1008,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -1001,110 +1019,110 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, 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:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl „%s“ fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1113,7 +1131,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1122,32 +1140,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1331,23 +1349,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Führe Information zur Verfügbarkeit zusammen"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Konnte Weiterleitungen nicht erzeugen"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Konnte gzip nicht ausführen"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Korrumpiertes Archiv"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s"
@@ -1493,8 +1511,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Paketlisten werden gelesen"
@@ -1575,30 +1593,30 @@ msgstr "Fehlerhafter „ConfFile“-Abschnitt in der Statusdatei, Abstand %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Fehler beim Parsen der MD5-Summe. Abstand %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 "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Interner Fehler, konnte Bestandteil %s nicht finden"
+#: 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 "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Konnte nicht in %s wechseln"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Interner Fehler, konnte Bestandteil nicht finden"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Konnte gültige Kontroll-Datei nicht finden"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Unparsbare Kontroll-Datei"
@@ -1697,7 +1715,7 @@ msgstr "Zeitüberschreitung der Verbindung"
msgid "Server closed the connection"
msgstr "Der Server hat die Verbindung geschlossen"
-#: 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 "Lesefehler"
@@ -1787,7 +1805,7 @@ msgstr "Datenübertragung fehlgeschlagen, Server antwortete „%s“"
msgid "Query"
msgstr "Abfrage"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Kann nicht aufrufen: "
@@ -1934,6 +1952,14 @@ msgstr "Verbindung fehlgeschlagen"
msgid "Internal error"
msgstr "Interner Fehler"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Datei nicht gefunden"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Verbindung zu früh beendet"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Kann eine leere Datei nicht mit mmap abbilden"
@@ -2094,54 +2120,54 @@ msgstr "Benutze kein Locking für NFS-eingebundene Lockdatei %s"
msgid "Could not get lock %s"
msgstr "Konnte Lock %s nicht bekommen"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Auf %s gewartet, aber es war nicht da"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s hat sich unerwartet beendet"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Konnte Datei %s nicht öffnen"
-#: 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 "Lesen, habe noch %lu zu lesen aber nichts mehr da"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Schreibfehler"
-#: 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 "Schreiben, habe noch %lu zu schreiben, konnte aber nicht"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Beim Schließen der Datei trat ein Problem auf"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Beim Unlinking Datei trat ein Problem auf"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Beim Synchronisieren einer Datei trat ein Problem auf"
@@ -2226,76 +2252,66 @@ msgstr "Mögliche Versionen"
msgid "Dependency Generation"
msgstr "Abhängigkeits-Generierung"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kann Paketdatei %s nicht parsen (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kann Paketdatei %s nicht parsen (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s („URI“)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s („dist“)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s („URI parse“)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s („Absolute dist“)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s („dist parse“)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Herstellerblock %s ist ungültig"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u zu lang in der Quelliste %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quelliste %s („type“)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ ist unbekannt in Zeile %u der Quelliste %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quelliste %s („vendor id“)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Unbekannte Herstellerkennung „%s“ in Zeile %u der Quelliste %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2313,7 +2329,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexdateityp „%s“ wird nicht unterstützt"
-#: 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."
@@ -2321,7 +2337,7 @@ msgstr ""
"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
"finden."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2329,7 +2345,7 @@ msgstr ""
"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
"könnte durch gehaltene Pakete hervorgerufen worden sein."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
@@ -2367,7 +2383,7 @@ msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
msgid "Unable to stat %s."
msgstr "Kann nicht auf %s zugreifen."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Sie müssen einige „source“-URIs für Quellen in die sources.list-Datei "
@@ -2478,16 +2494,20 @@ msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen."
msgid "Collecting File Provides"
msgstr "Sammle Datei-Empfehlungen ein"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Sichern des Quellcaches"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5-Summe stimmt nicht"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2496,7 +2516,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2505,28 +2525,123 @@ 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:419
+#: apt-pkg/acquire-item.cc:807
#, 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:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5-Summe stimmt nicht"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Herstellerblock %s ist ungültig"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Datei nicht gefunden"
+#: apt-pkg/cdrom.cc:487
+#, fuzzy, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr "Benutze CD-ROM-Einhängpunkt"
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr "Identifiziere... "
+
+#: apt-pkg/cdrom.cc:521
+#, fuzzy, c-format
+msgid "Stored Label: %s \n"
+msgstr "Speicherte Kennzeichnung: „"
+
+#: apt-pkg/cdrom.cc:541
+#, fuzzy, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Benutze CD-ROM-Einhängpunkt"
+
+#: apt-pkg/cdrom.cc:559
+#, fuzzy
+msgid "Unmounting CD-ROM\n"
+msgstr "Löse Laufwerkseinbindung des CD-ROMs"
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Warte auf Kopfzeilen (header)"
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Verbindung zu früh beendet"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Mounting CD-ROM...\n"
+msgstr "Binde CD-ROM ein"
+
+#: apt-pkg/cdrom.cc:589
+#, fuzzy
+msgid "Scanning Disc for index files..\n"
+msgstr "Suche auf CD nach Index-Dateien... "
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+#, fuzzy
+msgid "That is not a valid name, try again.\n"
+msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut"
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "Diese CD heißt jetzt:"
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Paketlisten werden gelesen"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Schreibe neue Quelliste"
+
+#: apt-pkg/cdrom.cc:737
+#, fuzzy
+msgid "Source List entries for this Disc are:\n"
+msgstr "Quelllisteneinträge für diese CD sind:"
+
+#: apt-pkg/cdrom.cc:771
+#, fuzzy
+msgid "Unmounting CD-ROM..."
+msgstr "Löse Laufwerkseinbindung des CD-ROMs"
+
+#: 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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Unbekannte Herstellerkennung „%s“ in Zeile %u der Quelliste %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2617,25 +2732,10 @@ msgstr "Verbindung zu früh beendet"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Konnte %s.new nicht in %s umbenennen"
-#~ msgid "Using CD-ROM mount point "
-#~ msgstr "Benutze CD-ROM-Einhängpunkt"
-
-#~ msgid "Unmounting CD-ROM"
-#~ msgstr "Löse Laufwerkseinbindung des CD-ROMs"
-
#~ msgid "Please insert a Disc in the drive and press enter"
#~ msgstr ""
#~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
-#~ msgid "Mounting CD-ROM"
-#~ msgstr "Binde CD-ROM ein"
-
-#~ msgid "Identifying.. "
-#~ msgstr "Identifiziere... "
-
-#~ msgid "Scanning Disc for index files.. "
-#~ msgstr "Suche auf CD nach Index-Dateien... "
-
#~ msgid "I found (binary):"
#~ msgstr "Habe gefunden (binär):"
@@ -2658,28 +2758,13 @@ msgstr "Verbindung zu früh beendet"
#~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel „Debian 2.2r1 "
#~ "Disk 1“"
-#~ msgid "That is not a valid name, try again "
-#~ msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut"
-
-#~ msgid "This Disc is called:"
-#~ msgstr "Diese CD heißt jetzt:"
-
#~ msgid " '"
#~ msgstr " „"
-#~ msgid "Writing new source list"
-#~ msgstr "Schreibe neue Quelliste"
-
-#~ msgid "Source List entries for this Disc are:"
-#~ msgstr "Quelllisteneinträge für diese CD sind:"
-
#~ msgid "Repeat this process for the rest of the CDs in your set."
#~ msgstr ""
#~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
-#~ msgid "Stored Label: '"
-#~ msgstr "Speicherte Kennzeichnung: „"
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/de.po b/po/de.po
index ed8c28140..969898dc4 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-08-04 15:58 +0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -146,14 +146,14 @@ msgstr " Versions-Tabelle:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -293,7 +293,7 @@ msgstr ""
" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kann nicht nach %s schreiben"
@@ -531,7 +531,12 @@ msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Maintainer ist %s und nicht %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Interner Fehler, konnte Bestandteil %s nicht finden"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Speicheranforderung fehlgeschlagen"
@@ -625,7 +630,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -701,112 +706,125 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Die sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Abhängigkeit werden korrigiert..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " fehlgeschlagen."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Kann Abhängigkeiten nicht korrigieren"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Fertig"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Die folgenden Pakete werden aktualisiert:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es müssen %sB Archive geholt werden.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben sein.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -817,28 +835,28 @@ msgstr ""
"Zum Fortfahren geben Sie bitte »%s« ein.\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abbruch."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Möchten Sie fortfahren? [J/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -846,48 +864,48 @@ msgstr ""
"Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder "
"mit »--fix-missing« probieren?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Konnte fehlende Pakete nicht korrigieren."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Installation abgebrochen."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Achtung, wähle %s an Stelle von %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Installiert]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Sie sollten eines explizit zum Installieren auswählen."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -898,51 +916,51 @@ msgstr ""
"Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
"ist oder nur aus einer anderen Quelle verfügbar ist.\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Doch die folgenden Pakete ersetzen es:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s hat keinen Installationskandidaten"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Re-Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ist schon die neueste Version.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« nimmt keine Argumente"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -950,27 +968,27 @@ msgstr ""
"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
"ignoriert oder alte an ihrer Stelle benutzt."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -978,7 +996,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:1477
+#: cmdline/apt-get.cc:1530
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 +1008,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -1001,110 +1019,110 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, 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:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1113,7 +1131,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1122,32 +1140,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1331,23 +1349,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Führe Information zur Verfügbarkeit zusammen"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Konnte Weiterleitungen nicht erzeugen"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Konnte gzip nicht ausführen"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Korrumpiertes Archiv"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s"
@@ -1493,8 +1511,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Paketlisten werden gelesen"
@@ -1575,30 +1593,30 @@ msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Abstand %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Fehler beim Parsen der MD5-Summe. Abstand %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 "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Interner Fehler, konnte Bestandteil %s nicht finden"
+#: 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 "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Konnte nicht in %s wechseln"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Interner Fehler, konnte Bestandteil nicht finden"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Konnte gültige Kontroll-Datei nicht finden"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Unparsbare Kontroll-Datei"
@@ -1697,7 +1715,7 @@ msgstr "Zeitüberschreitung der Verbindung"
msgid "Server closed the connection"
msgstr "Der Server hat die Verbindung geschlossen"
-#: 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 "Lesefehler"
@@ -1787,7 +1805,7 @@ msgstr "Datenübertragung fehlgeschlagen, Server antwortete »%s«"
msgid "Query"
msgstr "Abfrage"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Kann nicht aufrufen: "
@@ -1934,6 +1952,14 @@ msgstr "Verbindung fehlgeschlagen"
msgid "Internal error"
msgstr "Interner Fehler"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Datei nicht gefunden"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Verbindung zu früh beendet"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Kann eine leere Datei nicht mit mmap abbilden"
@@ -2094,54 +2120,54 @@ msgstr "Benutze kein Locking für NFS-eingebundene Lockdatei %s"
msgid "Could not get lock %s"
msgstr "Konnte Lock %s nicht bekommen"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Auf %s gewartet, aber es war nicht da"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s hat sich unerwartet beendet"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Konnte Datei %s nicht öffnen"
-#: 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 "Lesen, habe noch %lu zu lesen aber nichts mehr da"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Schreibfehler"
-#: 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 "Schreiben, habe noch %lu zu schreiben, konnte aber nicht"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Beim Schließen der Datei trat ein Problem auf"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Beim Unlinking Datei trat ein Problem auf"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Beim Synchronisieren einer Datei trat ein Problem auf"
@@ -2226,76 +2252,66 @@ msgstr "Mögliche Versionen"
msgid "Dependency Generation"
msgstr "Abhängigkeits-Generierung"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kann Paketdatei %s nicht parsen (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kann Paketdatei %s nicht parsen (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s (»Absolute dist«)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Herstellerblock %s ist ungültig"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u zu lang in der Quelliste %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quelliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« ist unbekannt in Zeile %u der Quelliste %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quelliste %s (»vendor id«)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quelliste %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2313,7 +2329,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexdateityp »%s« wird nicht unterstützt"
-#: 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."
@@ -2321,7 +2337,7 @@ msgstr ""
"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
"finden."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2329,7 +2345,7 @@ msgstr ""
"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
"könnte durch gehaltene Pakete hervorgerufen worden sein."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
@@ -2367,7 +2383,7 @@ msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
msgid "Unable to stat %s."
msgstr "Kann nicht auf %s zugreifen."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Sie müssen einige »source«-URIs für Quellen in die sources.list-Datei "
@@ -2478,16 +2494,20 @@ msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen."
msgid "Collecting File Provides"
msgstr "Sammle Datei-Empfehlungen ein"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Sichern des Quellcaches"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5-Summe stimmt nicht"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2496,7 +2516,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2505,28 +2525,123 @@ 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:419
+#: apt-pkg/acquire-item.cc:807
#, 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:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5-Summe stimmt nicht"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Herstellerblock %s ist ungültig"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Datei nicht gefunden"
+#: apt-pkg/cdrom.cc:487
+#, fuzzy, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr "Benutze CD-ROM-Einhängpunkt"
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr "Identifiziere... "
+
+#: apt-pkg/cdrom.cc:521
+#, fuzzy, c-format
+msgid "Stored Label: %s \n"
+msgstr "Speicherte Kennzeichnung: »"
+
+#: apt-pkg/cdrom.cc:541
+#, fuzzy, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Benutze CD-ROM-Einhängpunkt"
+
+#: apt-pkg/cdrom.cc:559
+#, fuzzy
+msgid "Unmounting CD-ROM\n"
+msgstr "Löse Laufwerkseinbindung des CD-ROMs"
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Warte auf Kopfzeilen (header)"
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Verbindung zu früh beendet"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Mounting CD-ROM...\n"
+msgstr "Binde CD-ROM ein"
+
+#: apt-pkg/cdrom.cc:589
+#, fuzzy
+msgid "Scanning Disc for index files..\n"
+msgstr "Suche auf CD nach Index-Dateien... "
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+#, fuzzy
+msgid "That is not a valid name, try again.\n"
+msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut"
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "Diese CD heißt jetzt:"
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Paketlisten werden gelesen"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Schreibe neue Quelliste"
+
+#: apt-pkg/cdrom.cc:737
+#, fuzzy
+msgid "Source List entries for this Disc are:\n"
+msgstr "Quelllisteneinträge für diese CD sind:"
+
+#: apt-pkg/cdrom.cc:771
+#, fuzzy
+msgid "Unmounting CD-ROM..."
+msgstr "Löse Laufwerkseinbindung des CD-ROMs"
+
+#: 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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quelliste %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2617,25 +2732,10 @@ msgstr "Verbindung zu früh beendet"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Konnte %s.new nicht in %s umbenennen"
-#~ msgid "Using CD-ROM mount point "
-#~ msgstr "Benutze CD-ROM-Einhängpunkt"
-
-#~ msgid "Unmounting CD-ROM"
-#~ msgstr "Löse Laufwerkseinbindung des CD-ROMs"
-
#~ msgid "Please insert a Disc in the drive and press enter"
#~ msgstr ""
#~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
-#~ msgid "Mounting CD-ROM"
-#~ msgstr "Binde CD-ROM ein"
-
-#~ msgid "Identifying.. "
-#~ msgstr "Identifiziere... "
-
-#~ msgid "Scanning Disc for index files.. "
-#~ msgstr "Suche auf CD nach Index-Dateien... "
-
#~ msgid "I found (binary):"
#~ msgstr "Habe gefunden (binär):"
@@ -2658,28 +2758,13 @@ msgstr "Verbindung zu früh beendet"
#~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 "
#~ "Disk 1«"
-#~ msgid "That is not a valid name, try again "
-#~ msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut"
-
-#~ msgid "This Disc is called:"
-#~ msgstr "Diese CD heißt jetzt:"
-
#~ msgid " '"
#~ msgstr " »"
-#~ msgid "Writing new source list"
-#~ msgstr "Schreibe neue Quelliste"
-
-#~ msgid "Source List entries for this Disc are:"
-#~ msgstr "Quelllisteneinträge für diese CD sind:"
-
#~ msgid "Repeat this process for the rest of the CDs in your set."
#~ msgstr ""
#~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
-#~ msgid "Stored Label: '"
-#~ msgstr "Speicherte Kennzeichnung: »"
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/el.po b/po/el.po
index 72490847a..dcd6342fb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-08-11 14:21+0300\n"
"Last-Translator: George Papamichelakis <george@step.gr>\n"
"Language-Team: <debian-l10n-greek@lists.debian.org>\n"
@@ -23,7 +23,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
#: cmdline/apt-cache.cc:135
#, c-format
@@ -112,7 +113,8 @@ msgstr "Αρχεία Πακέτου:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
+msgstr ""
+"Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -156,14 +158,14 @@ msgstr " Πίνακας Έκδοσης:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -300,7 +302,7 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
@@ -533,7 +535,12 @@ msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realoc - Αδυναμία εκχώρησης μνήμης"
@@ -627,7 +634,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -703,112 +710,126 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Διόρθωση εξαρτήσεων..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " απέτυχε."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Ετοιμο"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
"προβλήματα."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
-msgstr "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
+msgstr ""
+"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ναι, κανε ότι λέω!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -819,28 +840,28 @@ msgstr ""
"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Εγκατάλειψη."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Θέλετε να συνεχίσετε; [Ν/ο] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -848,47 +869,49 @@ msgstr ""
"Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
"ή το --fix-missing;"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
+msgstr ""
+"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Εγκατάλειψη της εγκατάστασης."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
+msgstr ""
+"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Εγκατεστημένα]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -900,51 +923,51 @@ msgstr ""
"Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
"από άλλη πηγή\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
"του\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το%s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -952,25 +975,25 @@ msgstr ""
"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
"στη θέση τους."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -978,7 +1001,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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 +1013,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -1000,114 +1023,116 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
-msgstr "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
+msgstr ""
+"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
+msgstr ""
+"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1116,32 +1141,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1311,7 +1336,8 @@ msgstr ""
"μόνο τα λάθη"
#: 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 ""
"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε [I]"
"nstall ξανά"
@@ -1320,23 +1346,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Αποτυχία κατά την εκτέλεση του gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Κατεστραμμένη αρχειοθήκη"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
@@ -1481,8 +1507,8 @@ msgstr "Οι φάκελοι info και temp πρέπει να βρίσκοντ
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Ανάγνωση Λιστών Πακέτων"
@@ -1562,30 +1588,30 @@ msgstr "Ελαττωματική εγγραφή ConfFile στο αρχείο κ
msgid "Error parsing MD5. Offset %lu"
msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή %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 "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %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 "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Αδύνατη η αλλαγή σε %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Μη αναλύσιμο αρχείο control"
@@ -1681,7 +1707,7 @@ msgstr "Λήξη χρόνου σύνδεσης"
msgid "Server closed the connection"
msgstr "Ο διακομιστής έκλεισε την σύνδεση"
-#: 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 "Σφάλμα ανάγνωσης"
@@ -1770,7 +1796,7 @@ msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο
msgid "Query"
msgstr "Επερώτηση"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Αδύνατη η εκτέλεση"
@@ -1896,7 +1922,8 @@ msgstr "Σφάλμα στην εγγραφή στο αρχείο"
#: methods/http.cc:832
msgid "Error reading from server Remote end closed connection"
-msgstr "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
+msgstr ""
+"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
#: methods/http.cc:834
msgid "Error reading from server"
@@ -1914,6 +1941,14 @@ msgstr "Η σύνδεση απέτυχε"
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Το αρχείο Δε Βρέθηκε"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Η σύνδεση έκλεισε πρόωρα"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχείου"
@@ -1961,7 +1996,8 @@ msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτή
#: apt-pkg/contrib/configuration.cc:643
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
+msgstr ""
+"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
#: apt-pkg/contrib/configuration.cc:650
#, c-format
@@ -2017,7 +2053,8 @@ msgstr "Η επιλογή %s απαιτεί ένα όρισμα."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>."
+msgstr ""
+"Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2056,7 +2093,8 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
#: apt-pkg/contrib/fileutl.cc:80
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
+msgstr ""
+"Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
#: apt-pkg/contrib/fileutl.cc:85
#, c-format
@@ -2075,54 +2113,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr "Αδύνατο το κλείδωμα %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-#: 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 "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Σφάλμα εγγραφής"
-#: 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 "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
@@ -2207,76 +2245,66 @@ msgstr "Υποψήφιες Εκδόσεις"
msgid "Dependency Generation"
msgstr "Παραγωγή Εξαρτήσεων"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Η εγγραφή Κατασκευαστής %s είναι άκυρη"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Άγνωστο ID κατασκευαστή '%s' στη γραμμή %u της λίστας πηγών %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2294,14 +2322,15 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ο τύπος αρχείου ευρετηρίου '%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."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
"κάποιας κατάλληλης αρχείοθήκης."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2309,7 +2338,7 @@ msgstr ""
"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
"προκλήθηκε από κρατούμενα πακέτα."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
@@ -2347,17 +2376,19 @@ msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου
msgid "Unable to stat %s."
msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
-msgstr "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
+msgstr ""
+"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
@@ -2370,7 +2401,8 @@ msgstr "Αδύνατη η κατανόηση του τύπου καθήλωση
#: apt-pkg/policy.cc:299
msgid "No priority (or zero) specified for pin"
-msgstr "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
+msgstr ""
+"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
@@ -2423,7 +2455,8 @@ msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των ε
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
#: apt-pkg/pkgcachegen.cc:241
#, c-format
@@ -2449,16 +2482,20 @@ msgstr "Αδύνατη η εύρεση της κατάστασης της λίσ
msgid "Collecting File Provides"
msgstr "Συλλογή Παροχών Αρχείου"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Ανόμοιο MD5Sum"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2467,7 +2504,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2476,26 +2513,115 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, 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 ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Ανόμοιο MD5Sum"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Η εγγραφή Κατασκευαστής %s είναι άκυρη"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Το αρχείο Δε Βρέθηκε"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Η σύνδεση έκλεισε πρόωρα"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Αναμονή επικεφαλίδων"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Ανάγνωση Λιστών Πακέτων"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Άγνωστο ID κατασκευαστή '%s' στη γραμμή %u της λίστας πηγών %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 6b98a4a95..303141371 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\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"
@@ -145,14 +145,14 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -230,7 +230,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -463,7 +463,12 @@ msgstr ""
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr ""
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr ""
@@ -557,7 +562,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -631,110 +636,122 @@ msgid ""
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -745,74 +762,74 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr ""
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr ""
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, fuzzy, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -820,73 +837,73 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -894,7 +911,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -902,149 +919,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, 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:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr ""
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1171,23 +1188,23 @@ msgstr ""
msgid "Merging Available information"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
@@ -1332,8 +1349,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr ""
@@ -1413,30 +1430,30 @@ msgstr ""
msgid "Error parsing MD5. Offset %lu"
msgstr ""
-#: 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 "This is not a valid DEB archive, missing ‘%s’ member"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr ""
+#: 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 "This is not a valid DEB archive, missing ‘%s’ member"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr ""
@@ -1528,7 +1545,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: 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 ""
@@ -1617,7 +1634,7 @@ msgstr "Data transfer failed, server said ‘%s’"
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr ""
@@ -1761,6 +1778,14 @@ msgstr ""
msgid "Internal error"
msgstr ""
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr ""
@@ -1920,54 +1945,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Waited for %s but it wasn't there"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr ""
@@ -2052,76 +2077,66 @@ msgstr ""
msgid "Dependency Generation"
msgstr ""
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type ‘%s’ is not known in on line %u in source list %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2135,19 +2150,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Index file type ‘%s’ is not supported"
-#: 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 ""
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2185,7 +2200,7 @@ msgstr ""
msgid "Unable to stat %s."
msgstr ""
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "You must put some ‘source’ URIs in your sources.list"
@@ -2285,51 +2300,141 @@ msgstr ""
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:718
#, 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:388
+#: apt-pkg/acquire-item.cc:771
#, 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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: methods/rsh.cc:264
-msgid "File Not Found"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
msgstr ""
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:728
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"
+
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
#~ "dependencies.\n"
diff --git a/po/es.po b/po/es.po
index 399b68c49..159beb9c5 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-12 23:35+0100\n"
"Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -149,14 +149,14 @@ msgstr " Tabla de versin:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -295,7 +295,7 @@ msgstr ""
" -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "No se puede escribir en %s"
@@ -531,7 +531,12 @@ msgstr " %s no tiene entrada de predominio\n"
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Error interno, no pude localizar el miembro %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - No pudo reservar memoria"
@@ -625,7 +630,7 @@ msgstr "Fall el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
@@ -701,111 +706,124 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales\n"
"Esto NO debe hacerse a menos que sepa exactamente lo que est haciendo!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarn, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Corrigiendo dependencias..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " fall."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "No se puede corregir las dependencias"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "No se puede minimizar el conjunto de actualizacin"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Listo"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Se actualizarn los siguientes paquetes:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hay problemas y se utiliz -y sin --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Se necesita descargar %sB/%sB de archivos.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Necesito descargar %sB de archivos.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Se utilizarn %sB de espacio de disco adicional despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Hay problemas y se utiliz -y sin --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Se especific Trivial Only pero sta no es una operacin trivial."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "S, haga lo que le digo!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -816,28 +834,28 @@ msgstr ""
"Para continuar escriba la frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Desea continuar? [S/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -845,47 +863,47 @@ msgstr ""
"No se pudieron obtener algunos archivos, quizs deba ejecutar\n"
"apt-get update o deba intentarlo de nuevo con --fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "No se pudieron corregir los paquetes que faltan."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Abortando la instalacin."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, seleccionando %s en lugar de %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquete %s no esta instalado, no se eliminar\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquete %s es un paquete virtual provisto por:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Necesita seleccionar explcitamente uno para instalar."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -896,49 +914,49 @@ msgstr ""
"a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n"
"encuentra disponible desde alguna otra fuente\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquete %s no tiene candidato para su instalacin"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ya est en su versin ms reciente.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No se encontr la Distribucin '%s' para '%s'"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontr la versin '%s' para '%s'"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versin seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -946,25 +964,25 @@ msgstr ""
"Algunos archivos de ndice no se han podido descargar, se han ignorado,\n"
"o se ha utilizado unos antiguos en su lugar."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -972,7 +990,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -984,7 +1002,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -994,107 +1012,107 @@ msgstr ""
"paquete simplemente no sea instalable y debera de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, 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:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1103,7 +1121,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1112,32 +1130,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1321,23 +1339,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Fusionando informacin disponible"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "No pude crear las tuberas"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "No pude ejecutar gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Archivo corrompido"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "No se aprob la suma de control del tar, archive corrompido"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
@@ -1483,8 +1501,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Leyendo lista de paquetes"
@@ -1564,30 +1582,30 @@ msgstr "Mala seccin del ConfFile en el archivo de estado. Desplazo %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Error leyendo Md5. Desplazo %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 "Este no es un archivo DEB vlido, falta el miembro '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Error interno, no pude localizar el miembro %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 "Este no es un archivo DEB vlido, falta el miembro '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "No pude cambiar a %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Error interno, no pude localizar el miembro"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "No pude localizar un archivo de control vlido"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Archivo de control inanalizable"
@@ -1683,7 +1701,7 @@ msgstr "La conexin expir"
msgid "Server closed the connection"
msgstr "El servidor cerr la conexin"
-#: 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 "Error de lectura"
@@ -1772,7 +1790,7 @@ msgstr "Fall transferencia de datos, el servidor dijo '%s'"
msgid "Query"
msgstr "Consulta"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "No pude invocar "
@@ -1916,6 +1934,14 @@ msgstr "Fallo la conexin"
msgid "Internal error"
msgstr "Error interno"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Fichero no encontrado"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "La conexin se cerr prematuramente"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "No puedo hacer mmap de un fichero vaco"
@@ -2079,54 +2105,54 @@ msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
msgid "Could not get lock %s"
msgstr "No se pudo bloquear %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba all"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "El subproceso %s recibi un fallo de segmentacin."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subproceso %s devolvi un cdigo de error (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subproceso %s termin de forma inesperada"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "No pude abrir el fichero %s"
-#: 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 "ledos, todava deba leer %lu pero no queda nada"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Error de escritura"
-#: 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 "escritos, todava tena que escribir %lu pero no pude hacerlo"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problemas cerrando el archivo"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Hay problemas desligando el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Hay problemas sincronizando el fichero"
@@ -2211,78 +2237,66 @@ msgstr "Versiones candidatas"
msgid "Dependency Generation"
msgstr "Generacin de dependencias"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "No se pudo tratar el archivo de paquetes %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Bloque de fabricante %s invlido"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Lnea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Lnea %u mal formada en lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr ""
-"ID del fabricante '%s' desconocido en la lnea %u de la lista de\n"
-"fuentes %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2300,7 +2314,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "No se da soporte para el tipo de archivo de ndice '%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."
@@ -2308,7 +2322,7 @@ msgstr ""
"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
"ste."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2316,7 +2330,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve gener cortes, esto puede haber sido "
"causado por paquetes retenidos."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes\n"
@@ -2356,7 +2370,7 @@ msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
msgid "Unable to stat %s."
msgstr "No se pudo leer %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Debe poner algunos URIs 'fuente' en su sources.list"
@@ -2464,16 +2478,20 @@ msgstr "No se puede leer la lista de paquetes fuente %s"
msgid "Collecting File Provides"
msgstr "Recogiendo archivos que proveen"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando cach fuente"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "La suma MD5 difiere"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2483,7 +2501,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2492,7 +2510,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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2500,21 +2518,118 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "El tamao difiere"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "La suma MD5 difiere"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Bloque de fabricante %s invlido"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Fichero no encontrado"
+#: apt-pkg/cdrom.cc:487
+#, fuzzy, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr "Usando punto de montaje CD-ROM"
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr "Identificando.. "
+
+#: apt-pkg/cdrom.cc:521
+#, fuzzy, c-format
+msgid "Stored Label: %s \n"
+msgstr "Etiqueta guardada: "
+
+#: apt-pkg/cdrom.cc:541
+#, fuzzy, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Usando punto de montaje CD-ROM"
+
+#: apt-pkg/cdrom.cc:559
+#, fuzzy
+msgid "Unmounting CD-ROM\n"
+msgstr "Desmontando CD-ROM"
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Esperando las cabeceras"
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "La conexin se cerr prematuramente"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Mounting CD-ROM...\n"
+msgstr "Montando CD-ROM"
+
+#: apt-pkg/cdrom.cc:589
+#, fuzzy
+msgid "Scanning Disc for index files..\n"
+msgstr "Buscando en el disco por el archivo de indexacin"
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+#, fuzzy
+msgid "That is not a valid name, try again.\n"
+msgstr "Ese no es un nombre vlido, intente de nuevo "
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "Este disco se llama: "
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Leyendo lista de paquetes"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Escribiendo nueva lista de fuente"
+
+#: apt-pkg/cdrom.cc:737
+#, fuzzy
+msgid "Source List entries for this Disc are:\n"
+msgstr "Las entradas de la lista de fuentes para este disco son:"
+
+#: apt-pkg/cdrom.cc:771
+#, fuzzy
+msgid "Unmounting CD-ROM..."
+msgstr "Desmontando CD-ROM"
+
+#: 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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "ID del fabricante '%s' desconocido en la lnea %u de la lista de\n"
+#~ "fuentes %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2723,24 +2838,9 @@ msgstr "La conexin se cerr prematuramente"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "No pude renombrar %s.new a %s"
-#~ msgid "Using CD-ROM mount point "
-#~ msgstr "Usando punto de montaje CD-ROM"
-
-#~ msgid "Unmounting CD-ROM"
-#~ msgstr "Desmontando CD-ROM"
-
#~ msgid "Please insert a Disc in the drive and press enter"
#~ msgstr "Por favor inserte un disco en la unidad y presione Intro"
-#~ msgid "Mounting CD-ROM"
-#~ msgstr "Montando CD-ROM"
-
-#~ msgid "Identifying.. "
-#~ msgstr "Identificando.. "
-
-#~ msgid "Scanning Disc for index files.. "
-#~ msgstr "Buscando en el disco por el archivo de indexacin"
-
#~ msgid "I found (binary):"
#~ msgstr "Encontr (binario):"
@@ -2763,27 +2863,12 @@ msgstr "La conexin se cerr prematuramente"
#~ msgstr ""
#~ "Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'"
-#~ msgid "That is not a valid name, try again "
-#~ msgstr "Ese no es un nombre vlido, intente de nuevo "
-
-#~ msgid "This Disc is called:"
-#~ msgstr "Este disco se llama: "
-
#~ msgid " '"
#~ msgstr " '"
-#~ msgid "Writing new source list"
-#~ msgstr "Escribiendo nueva lista de fuente"
-
-#~ msgid "Source List entries for this Disc are:"
-#~ msgstr "Las entradas de la lista de fuentes para este disco son:"
-
#~ msgid "Repeat this process for the rest of the CDs in your set."
#~ msgstr "Repita este proceso para el resto de los CDs del conjunto."
-#~ msgid "Stored Label: '"
-#~ msgstr "Etiqueta guardada: "
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/eu.po b/po/eu.po
index 4bc515f2b..7390a2d79 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-16 22:43+0100\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Librezale.org <librezale@librezale.org>\n"
@@ -148,14 +148,14 @@ msgstr " Bertsio tabla:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s %s %s-rentzat %s %s-ean konpilaturik\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -291,7 +291,7 @@ msgstr ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Ezin da %s-n idatzi"
@@ -522,7 +522,12 @@ msgstr " %s ez di gainidazteko erregistrotik\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s-ren mantentzailea %s da ez %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Barne Errorea, ezin da %s atala kokatu"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Huts egin da memoria esleitzean"
@@ -616,7 +621,7 @@ msgstr "Huts %s %s-ra berrizendatzerakoan"
msgid "Y"
msgstr "B"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Espresio Erregular konpilazio errorea - %s"
@@ -692,110 +697,123 @@ msgstr ""
"KONTUZ: Hurrengo beharrezko paketeak ezabatuak izango dira\n"
"Zuk EZ zenuke hau egin behar zer egitera zoazen ziur ez badakizu!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu eguneratzeko, %lu berri instalatzeko, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatzeko, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu atzeratzeko, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ezabatzeko eta %lu eguneratu gabe.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez guztiz instalatu edo ezabaturik.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Dependentziak zuzentzen..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " huts egin da."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Ezin dira dependetziak zuzendu"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Ezin da eguneraketa mutzoa txikiagotu"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Egina"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Zuk `apt-get -f install' exekutatu beharko zenuke hau zuzentzeko."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Betegabeko dependetziak. Saiatu -f erabiliaz."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Hurrengo paketeak eguneratuak izango dira:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Arazoak daude eta --y --force-yes gabe erabili da"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga karpeta blokeatu"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Iturburu zerrenda ezin da irakurri."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB fitxategi eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB fitxategi eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Despaketatu ondoren diskotik %sB leku libre erabiliko da.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Despaketatu ondoren diskoan %sB leku hustuko da.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Ez duzu behar aina leku %s-n"
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Arazoak daude eta --y --force-yes gabe erabili da"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Tirvial Only ezarri duzu baina hau ez da ekintza xume bat."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Bai, egin nik esan bezala!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -806,28 +824,28 @@ msgstr ""
"Jarraitu nahi ezkero idatzi '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abortatu."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Aurrera jarraitu nahi al duzu? [B/e]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Huts egin da %s eskuratzen %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Huts zenbait fitxategi deskargatzerakoan"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Dekarga osoturik eta bakarrik deskarga moduan"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -835,47 +853,48 @@ msgstr ""
"Ezin dira fitxategi batzu eskuratu, apt-get update abiarazi edo saiatu --"
"fix- missing erabiliaz?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing eta medio aldaketa ez dira onartzen orain."
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Ezin dira falta diren paketeak konpondu."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Abortatu instalazioa."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Oharra, %s aukeratzen %s-ren ordez\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s Albo batetara uzten, instalaturik dago eta eguneraketa ez dago gaiturik\n"
+msgstr ""
+"%s Albo batetara uzten, instalaturik dago eta eguneraketa ez dago gaiturik\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s paketea ez dagoinstalaturik, beraz ez da ezabatuko\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s Paketea pakete birtual bat da eta beste honek dakar:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Instalatua]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Instalatzekozehazki bat ezarri behar duzu."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -887,49 +906,49 @@ msgstr ""
" dagoela edo beste jatorri batetatik bakarrik eskuratu daitekeela\n"
"esan nahi du\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Hala ere, hurrengo paketeek berre lekua beteko dute:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s paketea ez da instalagarria"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ez da posible %s berrinstalatzea, ezin da deskargatu.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s dagoeneko bertsio berrienean dago.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%s' Bertsioa ez da aurkitu '%s'-rentzat"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ez da aurkitu '%s' bertsioa '%s'rentzat"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Aukeratutako %s bertsioa (%s) %srentzat\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "update komandoak ez du argumenturik onartzen"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda karpeta blokeatu"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -937,25 +956,25 @@ msgstr ""
"Zenbait indize fitxategi deskargatzerakoan huts egin dute, horiek alde "
"batetara utziko dira edo beste zaharrago batzuek erabiliko dira."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s aukeratzen '%s' espresio erregularrantzat\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Zuk `apt-get -f install' exekutatu beharko zenuke hau(ek) zuzentzeko:"
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -963,7 +982,7 @@ msgstr ""
"Betegabeko dependentziak. SAiatu 'apt-get -f install' komandoa pakete izen "
"gaber erabiltzen."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -975,7 +994,7 @@ msgstr ""
"ezegonkorra erabiltzen ari zarelako edo paketak baketatik kendu izan\n"
"direlako izan daiteke."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -985,112 +1004,114 @@ msgstr ""
"instalagarria \n"
"izatea eta arazo informe bat bidali beharkozenuke pàkete horren kontra"
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Hurrengoargibide hauek arazoa konpontzen lagundu dezakete:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Apurtutako paketeak"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Huirrengo pakete extra hauek instalatuko dira:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Iradokitutako paketeak:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Huts egin da"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr " Egina"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr "Iturburua eskuratzeko beintzat pakete bat ezarri behar duzu"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da %s-ren iturburu paketea aurkitu"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez duzu behar aina leku %s-n"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB iturburu fitxategi eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB iturburu fitxategi eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Huts fitxategi batzu eskuratzerakoan."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Alde batetara uzten dagoeneko %s-n despaketatutako iturburuen despaketatzea\n"
+msgstr ""
+"Alde batetara uzten dagoeneko %s-n despaketatutako iturburuen despaketatzea\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskapketatze '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' eraikitze komanduak huts egin du.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Ume prozezuak huts egin du"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
-msgstr "Eraiketa dependentziak arakatzeko beintzat pakete bat ezarri behar duzu"
+msgstr ""
+"Eraiketa dependentziak arakatzeko beintzat pakete bat ezarri behar duzu"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s eraiketa dependentzia argibiderik eskuratu"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ez du eraiketa dependentziarik.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s dependentzia (%s-rena) ezub da bete %s paketea ezin bai da aurkitu"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1099,32 +1120,32 @@ msgstr ""
"%s dependentzia (%s-rena) ezin da bete, ez bait dago %s paketearen bertsio "
"beharrak beteko dituen paketerik"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ezin izan da %s dependentzia bete %s-rentzat: %s instalatutako paketea "
"berriegia da"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ezin da %s dependentzi bete %s-rentzat: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Ez da lortu %s rentzat dependentziak sortzea"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Huts eraikitze dependentziak prozesatzerakoan"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1294,10 +1315,12 @@ msgstr "instalaturik dauden paketeak. Honek bikoizketa erroreak sor ditzake"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "edo dependentzia faltagatik sortutako erroreak. Hau Ondo dago, bakarrik"
+msgstr ""
+"edo dependentzia faltagatik sortutako erroreak. Hau Ondo dago, bakarrik"
#: 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 ""
"hemendik aurrerako mezuak dira garrantzitsuak. Mesedez zuzendu horiek eta [I]"
"nstall berrabiarazi"
@@ -1306,23 +1329,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Eskuragarrien datuak biltzen"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Huts egin da hodiak sortzen"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Huts egin da gzip exekutatzean "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Artxibo ustela"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "%u TAR buru mota ezezaguna, %s atala"
@@ -1467,8 +1490,8 @@ msgstr "info eta temp karpetak fitxategi sistema berdinean egon behar dira"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Pakete Zerrenda irakurtzen"
@@ -1547,30 +1570,30 @@ msgstr "Egoera fitxategian ConfFile-a sekzioa gaizki dago. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Errorea MD5 parseatzean. Offset %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 "Hau ez da balioz DEB fitxategi bat, %s atala falta du"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Barne Errorea, ezin da %s atala kokatu"
+#: 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 "Hau ez da balioz DEB fitxategi bat, %s atala falta du"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Ezin aldatu %sra"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Barne Errorea, ezin da atala kokatu"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Huts baliozko kontrol fitxategi bat kokatzerakoan"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Kontrol fitxategi ezin analizagarria"
@@ -1666,7 +1689,7 @@ msgstr "Konexioa denboraz kanpo"
msgid "Server closed the connection"
msgstr "Zerbitzariak konexioa itxi du"
-#: 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 "Irakurketa errorea"
@@ -1755,7 +1778,7 @@ msgstr "Datu transferentziak huts egin du, zerbitzariak hau dio '%s'"
msgid "Query"
msgstr "Kontsultatu"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Ezin da deitu "
@@ -1899,6 +1922,14 @@ msgstr "Konexioak huts egin du"
msgid "Internal error"
msgstr "Barne errorea"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Ez da fitxategia aurkitu"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Konexioa behar baina lehenago itxi da"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Ezin da mmap-eatu fitxategi huts bat"
@@ -2002,7 +2033,8 @@ msgstr "%s aukerak argumentu bat behar du."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "%s aukera: Konfigurazio elementu baten ezarpena =<val> bat eduki behar du."
+msgstr ""
+"%s aukera: Konfigurazio elementu baten ezarpena =<val> bat eduki behar du."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2060,54 +2092,54 @@ msgstr "Ez da blokeorik erabiltzen nfs muntatze %s blokeo fitxategiarentzat"
msgid "Could not get lock %s"
msgstr "Ezin lortu %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "%s azpiprozesuak segementazio huts bat jaso du."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s azpiprozesuak errore kode bat eman du (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s azpiprozesua espero ez zen modu batetan itxi da"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Ezin ireki %s fitxategia"
-#: 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 "irakurri, %lu geratzen dira irakurtzeko baina ez dago ezer"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Idazketa errorea"
-#: 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 "idatzirik, oraindik %lu idatzi behar dira baina ezi da egin"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Arazoa fitxategia itxitzerakoan"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Arazoa fitxategi esteka ezabatzerakoan"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzerakoan"
@@ -2192,76 +2224,66 @@ msgstr "Hautagaien bertsioak"
msgid "Dependency Generation"
msgstr "Dependentzi Sormena"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ezin da %s (1) pakete fitxategia analizatu"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s (2) pakete fitxategia analizatu"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (ban)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki eratutako %lu lerroa %s iturburu zerrenda (banaketa analisia)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Okerreko %s saltzaile blokea"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%u lerro luzeegia %s iturburu zerrendan."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki eratutako %u lerroa %s iturburu zerrendan (mota)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' mota ezezaguna %u lerroan %s iturburu zerrendan. "
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gaizki eratutako %u lerroa %s iturburu zerrendan (saltzaile id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "'%s' Saltzaile ID ezezaguna %u lerria %s iturburu zerrenda."
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2278,14 +2300,15 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "'%s' fitxategi indize mota ez da onartzen"
-#: 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."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"%s paketea berrinstalatu egin behar da baina ez da fitxategirik aurkitzen "
"egiteko."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2293,7 +2316,7 @@ msgstr ""
"Errorea, pkgProblemResolver::Resolve-k hausturak sortu ditu, hau pakete "
"hizoztuen erruz izan liteke."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ezin izan dira arazoak zuzendu, zuk apurtutako paketeak hizoztu\n"
@@ -2333,7 +2356,7 @@ msgstr "Ezin izan da beharrezko pakete sistema atzeman."
msgid "Unable to stat %s."
msgstr "Ezin izan da %s irakurri."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Iturburu URI batzuk ipini behar dituzu zure sources.list fitxategian"
@@ -2407,7 +2430,8 @@ msgstr "Arraioa, zuk APT-k kudeatu ditzaken bertsio zenbakia gainditu duzu."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Arraioa, zuk APT-k kudeatu ditzaken dependentzia zenbakia gainditu duzu."
+msgstr ""
+"Arraioa, zuk APT-k kudeatu ditzaken dependentzia zenbakia gainditu duzu."
#: apt-pkg/pkgcachegen.cc:241
#, c-format
@@ -2433,16 +2457,20 @@ msgstr "Ezin da %s iturburu pakete zerrenda irakurri"
msgid "Collecting File Provides"
msgstr "Dakartzaten fitxategiak eskuratzen"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "S/I errorea katxe iturburua gordetzerakoan"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "berrizendaketak huts egin du, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum-ak ez datoz bat"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2451,7 +2479,7 @@ msgstr ""
"Ezin izan da %s paketarentzat fitxategi bat aurkitu. Honek pakete hau eskuz "
"zuzendu behar duzula esan dezake (arkitektura baten falta dela eta)."
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2460,24 +2488,115 @@ msgstr ""
"Ezin izan da %s paketarentzat fitxategi bat aurkitu. Honek pakete hau eskuz "
"zuzendu behar duzula esan dezake."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
-msgstr "Pakete indize fitxategiak hondaturik daude. Fitxategi izen gabe: %s pakete eremua."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Pakete indize fitxategiak hondaturik daude. Fitxategi izen gabe: %s pakete "
+"eremua."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Tamainak ez datoz bat"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum-ak ez datoz bat"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Okerreko %s saltzaile blokea"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Ez da fitxategia aurkitu"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Konexioa behar baina lehenago itxi da"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Goiburuei itxaroten"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "%u lerro luzeegia %s iturburu zerrendan."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "'%s' Saltzaile ID ezezaguna %u lerria %s iturburu zerrenda."
diff --git a/po/fi.po b/po/fi.po
index 726839d07..b3a008e69 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-13 16:34+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -148,14 +148,14 @@ msgstr " Versiotaulukko:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -289,7 +289,7 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -523,7 +523,12 @@ msgstr " %s: ei poikkeustietuetta\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Muistin varaaminen ei onnistunut"
@@ -617,7 +622,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -693,111 +698,124 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Korjataan riippuvuuksia..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " ei onnistunut."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Riippuvuuksien korjaus ei onnistu"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Päivitysjoukon minimointi ei onnistu"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Valmis"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Nämä paketit päivitetään:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
+
+#: cmdline/apt-get.cc:762
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:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Noudettavaa arkistoa %st/%st.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Noudettavaa arkistoa %st.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Kyllä, tee kuten käsketään!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -808,28 +826,28 @@ msgstr ""
"Jatka kirjoittamalla \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Keskeytä."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Haluatko jatkaa? [K/e] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -837,47 +855,47 @@ msgstr ""
"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai "
"kokeile --fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Puuttuvia paketteja ei voi korjata."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Asennus keskeytetään."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Asennettu]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Yksi pitää valita asennettavaksi."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -888,49 +906,49 @@ msgstr ""
"Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
"saatavilla vain jostain muusta lähteestä\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketilla %s ei ole asennettavaa valintaa"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s on jo uusin versio.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -938,25 +956,25 @@ msgstr ""
"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
"käytetty vanhoja. "
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -964,7 +982,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -975,7 +993,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -985,106 +1003,106 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1092,7 +1110,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1101,32 +1119,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1303,23 +1321,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Yhdistetään saatavuustiedot"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Putkien luonti ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "exec gzip ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
@@ -1464,8 +1482,8 @@ msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Luetaan pakettiluetteloita"
@@ -1545,30 +1563,30 @@ msgstr "Virheellinen ConfFile-lohko tilatiedostossa. Kohta %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %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 "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
+#: 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 "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Kansioon %s vaihto ei onnistunut"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Tapahtui sisäinen virhe, tiedostoa ei löydy"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Kelvollista ohjaustiedostoa ei löydy"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Ohjaustiedosto ei jäsenny"
@@ -1664,7 +1682,7 @@ msgstr "Yhteys aikakatkaistiin"
msgid "Server closed the connection"
msgstr "Palvelin sulki yhteyden"
-#: 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 "Lukuvirhe"
@@ -1753,7 +1771,7 @@ msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
msgid "Query"
msgstr "Kysely"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Käynnistys ei onnistu"
@@ -1897,6 +1915,14 @@ msgstr "Yhteys ei toiminut"
msgid "Internal error"
msgstr "Sisäinen virhe"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Tiedostoa ei löydy"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Yhteys katkesi ennenaikaisesti"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
@@ -2056,54 +2082,54 @@ msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s"
msgid "Could not get lock %s"
msgstr "Lukkoa %s ei saada"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Aliprosessi %s lopetti odottamatta"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Tiedostoa %s ei voitu avata"
-#: 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 "read, vielä %lu lukematta mutta tiedosto loppui"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Virhe kirjoitettaessa"
-#: 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 "write, vielä %lu kirjoittamatta mutta epäonnistui"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Pulmia tiedoston sulkemisessa"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Pulmia tehtäessä tiedostolle unlink"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
@@ -2188,76 +2214,66 @@ msgstr "Mahdolliset versiot"
msgid "Dependency Generation"
msgstr "Luodaan riippuvuudet"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Toimittajan lohko %s on virheellinen"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2274,13 +2290,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-#: 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 "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2288,7 +2304,7 @@ msgstr ""
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
@@ -2326,7 +2342,7 @@ msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
msgid "Unable to stat %s."
msgstr "stat %s ei onnistu."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
@@ -2428,16 +2444,20 @@ msgstr "stat ei toiminut lähdepakettiluettelolle %s"
msgid "Collecting File Provides"
msgstr "Kootaan tiedostojen tarjoamistietoja"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum ei täsmää"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2446,7 +2466,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2455,7 +2475,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2463,18 +2483,108 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Koko ei täsmää"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum ei täsmää"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Toimittajan lohko %s on virheellinen"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Tiedostoa ei löydy"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Yhteys katkesi ennenaikaisesti"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Odotetaan otsikoita"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Luetaan pakettiluetteloita"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s"
diff --git a/po/fr.po b/po/fr.po
index c7a96393e..20fc69206 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: 2004-12-23 12:36+0100\n"
-"PO-Revision-Date: 2005-01-20 18:33+0100\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
+"PO-Revision-Date: 2005-02-05 07:42+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -149,7 +149,7 @@ msgstr " Table de version:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 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
#, c-format
@@ -1589,7 +1589,9 @@ 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 ne comporte pas de partie %s ou %s ."
+msgstr ""
+"Ce n'est pas une archive DEB valide, elle ne comporte pas de partie %s "
+"ou %s ."
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1704,7 +1706,7 @@ msgstr "Dpassement du dlais de connexion"
msgid "Server closed the connection"
msgstr "Le serveur a ferm la connexion"
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "Erreur de lecture"
@@ -2110,54 +2112,54 @@ msgstr "Verrou non utilis pour le fichier %s se situant sur une partition nfs"
msgid "Could not get lock %s"
msgstr "Impossible de verrouiller %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "A attendu %s mais il n'tait pas prsent"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Le sous-processus %s a commis une violation d'accs mmoire"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Le sous-processus %s a renvoy un code d'erreur (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Le sous-processus %s s'est arrt prmaturment"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Impossible de verrouiller %s"
-#: 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 "lu(s), %lu restant lire, mais rien n'est disponible"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Erreur d'criture"
-#: 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 "crit(s), %lu restant crire, mais l'ecriture est impossible"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problme de fermeture du fichier"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problme d'effacement du fichier"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problme de synchronisation du fichier"
@@ -2495,11 +2497,11 @@ msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sou
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:897
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: apt-pkg/acquire-item.cc:711
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2509,7 +2511,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:764
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2518,14 +2520,14 @@ msgstr ""
"Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:800
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid "The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:887
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Taille incohrente"
@@ -2534,6 +2536,100 @@ msgstr "Taille incohrente"
msgid "Vendor block %s contains no fingerprint"
msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Utilisation du point de montage %s pour le cdrom\n"
+"Montage du cdrom\n"
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr "Identification..."
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr "tiquette prsente : %s\n"
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Utilisation du point de montage %s pour le cdrom\n"
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr "Dmontage du cdrom\n"
+
+#: apt-pkg/cdrom.cc:563
+msgid "Waiting for disc...\n"
+msgstr "Attente du disque...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr "Montage du cdrom...\n"
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr "Examen du disque la recherche de fichiers d'index...\n"
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "%i index de paquets, %i index de sources et %i signatures trouvs\n"
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Ce disque porte le nom suivant : \n"
+" %s \n"
+
+#: apt-pkg/cdrom.cc:704
+msgid "Copying package lists..."
+msgstr "Copie des listes de paquets"
+
+#: apt-pkg/cdrom.cc:728
+msgid "Writing new source list\n"
+msgstr "criture de la nouvelle liste de sources\n"
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr "Les entres de liste de sources pour ce disque sont :\n"
+
+#: apt-pkg/cdrom.cc:771
+msgid "Unmounting CD-ROM..."
+msgstr "Dmontage du cdrom..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i enregistrements crits.\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i enregistrements crits avec %i fichiers manquants.\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismachted files\n"
+msgstr "%i enregistrements crits avec %i correspondances incorrectes\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr "%i enregistrement crits avec %i fichiers manquants et %i correspondances incorrectes\n"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "Identifiant %s du fournisseur inconnu dans la ligne %u de la liste "
diff --git a/po/he.po b/po/he.po
index a29e9aef8..64425ea5f 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -146,14 +146,14 @@ msgstr ""
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -231,7 +231,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "לא מצליח לכתוב ל-%s"
@@ -424,7 +424,12 @@ msgstr ""
msgid " %s maintainer is %s not %s\n"
msgstr "המתחזק של %s הוא %s ולא %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr ""
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - כשלון בהקצאת זיכרון"
@@ -518,7 +523,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -592,110 +597,123 @@ msgid ""
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu משודרגים, %lu מותקנים חדשים, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu מותקנות מחדש, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu משודרגות מטה, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "מתקן תלויות..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr "כשלון."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "לא מצליח לתקן תלויות"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr "סיום"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "החבילות הבאות ישודרגו:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "רשימת המקורות לא ניתנת לקריאה."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "צריך לקבל %sB מתוך הארכיונים.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "אין לך מספיק מקום פנוי ב-%s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "כן, עשה כפי שאני אומר!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -703,74 +721,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "בטל."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr ""
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -778,79 +796,79 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -858,149 +876,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, 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:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr ""
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1124,23 +1142,23 @@ msgstr ""
msgid "Merging Available information"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
@@ -1285,8 +1303,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr ""
@@ -1363,30 +1381,30 @@ msgstr ""
msgid "Error parsing MD5. Offset %lu"
msgstr ""
-#: 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 ""
-#: apt-inst/deb/debfile.cc:72
+#: apt-inst/deb/debfile.cc:52
#, c-format
-msgid "Internal Error, could not locate member %s"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr ""
@@ -1478,7 +1496,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: 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 ""
@@ -1567,7 +1585,7 @@ msgstr ""
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr ""
@@ -1711,6 +1729,14 @@ msgstr ""
msgid "Internal error"
msgstr ""
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr ""
@@ -1870,54 +1896,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr ""
-#: 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 ""
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr ""
@@ -2002,76 +2028,66 @@ msgstr ""
msgid "Dependency Generation"
msgstr ""
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr ""
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2085,19 +2101,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: 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 ""
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2135,7 +2151,7 @@ msgstr ""
msgid "Unable to stat %s."
msgstr ""
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
@@ -2235,47 +2251,134 @@ msgstr ""
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:718
#, 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:388
+#: apt-pkg/acquire-item.cc:771
#, 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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: methods/rsh.cc:264
-msgid "File Not Found"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:728
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 18a4b4503..977328589 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-01-20 19:00+0100\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-23 21:52+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -149,14 +149,14 @@ msgstr " Verzitblzat:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ehhez: %s %s fordts ideje: %s %s\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -291,7 +291,7 @@ msgstr ""
" -c=? Ezt a konfigurcis fjlt olvassa be\n"
" -o=? Bellt egy tetszleges konfigurcis opcit, pl -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet rni ebbe: %s"
@@ -522,7 +522,12 @@ msgstr " %s nem rendelkezik fellbrl bejegyzssel\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartja %s, nem %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Bels hiba, %s tag nem tallhat"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Nem sikerlt memrit lefoglalni"
@@ -616,7 +621,7 @@ msgstr "Nem sikerlt tnevezni a kvetkezt: %s erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordtsi hiba - %s"
@@ -692,110 +697,123 @@ msgstr ""
"FIGYELEM: A kvetkez alapvet csomagok kerlnek eltvoltsra\n"
"Ezt nem kellene megtenni, kivve ha pontosan tudod mit csinlsz!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu csomag frisstve lesz, %lu j csomag lesz teleptve, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu jra lesz teleptve, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu vissza lesz fejlesztve, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu el lesz tvoltva s %lu nem lesz frisstve.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu csomag nincs teljesen teleptve vagy eltvoltva.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Fggsgek javtsa..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " sikertelen."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Nem lehet javtani a fggsgeket"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Nem lehet minimalizlni a frisstend csomagok mennyisgt"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Ksz"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Ezek kijavtshoz prbld futtatni az 'apt-get -f install'-t ."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Teljestetlen fggsgek. Prbld a -f hasznlatval."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "A kvetkez csomagok frisstve lesznek:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Problmk vannak s a -y -t hasznltad --force-yes nlkl"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Csomagokat kellene eltvoltani, de az Eltvolts nem engedlyezett."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Nem tudom zrolni a letltsi knyvtrat"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A forrsok listja olvashatatlan."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Az archvumokbl %sB/%sB-t kell letlteni.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB-t kell letlteni az archvumokbl.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Kicsomagols utn %sB lemezterlet lesz felhasznlva.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Kicsomagols utn %sB lemezterlet kerl felszabadtsra.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nincs elg szabad hely itt: %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Problmk vannak s a -y -t hasznltad --force-yes nlkl"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "A 'Trivial Only' meg van adva, de ez nem egy trivilis mvelet."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Igen, tedd amit mondok!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -806,28 +824,28 @@ msgstr ""
"A folytatshoz rd be a kvetkez kifejezst '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Megszaktva."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Folytatni akarod? [Y/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nem sikerlt letlteni a kvetkezt: %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Nhny fjlt nem sikerlt letlteni"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "A letlts befejezdtt a 'csak letlts' mdban"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -835,47 +853,47 @@ msgstr ""
"Nem lehet letlteni nhny archvot, taln prbld az apt-get update -et "
"vagy a --fix-missing -et."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing s a mdia csere mg nem tmogatott"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Nem lehet javtani a hinyz csomagokat."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Telepts megszaktsa."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Megjegyzs: %s kivlasztsa %s helyett\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s kihagysa, ez mr teleptve van s a frissts nincs belltva.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "A(z) %s csomag nincs teleptve, gy nem tvolthat el\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "A(z) %s egy virtulis csomag, amit a kvetkez szolgltat:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Teleptve]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Egyet hatrozottan ki kell vlasztanod teleptsre."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -886,49 +904,49 @@ msgstr ""
"hivatkozik r. Ez azt jelentheti, hogy a csomag hinyzik, elavult,\n"
"vagy csak ms forrsbl rhet el\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Azonban a kvetkez csomagok felvltjk:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "A(z) %s csomagnak nincs jelltje a teleptshez"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s jrateleptse nem lehetsges, mert nem lehet letlteni.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s mr a legjabb verzi.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%s' kiads ehhez: '%s' nem tallhat"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%s' verzi ehhez: '%s' nem tallhat"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kivlasztott verzi ehhez: %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listaknyvtrat zrolni"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -936,26 +954,26 @@ msgstr ""
"Nhny index fjlt nem sikerlt letlteni, ezek mellzve lesznek, vagy a "
"rgi vltozatuk lesz hasznlva."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Bels hiba, AllUpgrade megsrtett valamit"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Nem tallhat a(z) %s csomag"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzs: %s kivlasztsa %s regulris kifejezshez\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"A kvetkezk kijavtshoz prbld futtatni az 'apt-get -f install'-t :"
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -963,7 +981,7 @@ msgstr ""
"Teljestetlen fggsgek. Prbld az 'apt-get -f install'-t csomagok nlkl "
"(vagy teleptsd a fggsgeket is!)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -975,7 +993,7 @@ msgstr ""
"hasznlod, akkor nhny ignyelt csomag mg nem kszlt el vagy ki\n"
"lett mozdtva az Incoming-bl."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -985,108 +1003,108 @@ msgstr ""
"hogy a csomag egyszeren nem telepthet s egy hibajelentst kellene\n"
"kitlteni a csomaghoz."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "A kvetkez informci taln segt megoldani a helyzetet:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Trtt csomagok"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "A kvetkez extra csomagok kerlnek teleptsre:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Ajnlott csomagok:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Frissts kiszmtsa... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Ksz"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalbb egy csomagot meg kell adnod, aminek a forrst le kell tlteni"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem tallhat forrscsomag ehhez: %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elg szabad hely itt: %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrsarchvot kell letlteni.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrsarchvumot kell letlteni.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Forrs letltse: %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Nem sikerlt nhny archvumot letlteni."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy mr kibontott forrs kibontsnak kihagysa itt: %s\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontsi parancs nem sikerlt.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elksztsi parancs nem sikerlt.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnl"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalbb egy csomagot adj meg, aminek a fordtsi fggsgeit ellenrizni "
"kell"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordtsi-fggsg informcijt beszerezni"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordtsi fggsge a kvetkeznek: %s.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1095,7 +1113,7 @@ msgstr ""
"%s fggsge ennek: %s, ez nem elgthet ki, mert a(z) %s csomag nem "
"tallhat"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1104,32 +1122,32 @@ msgstr ""
"%s fggsge ennek: %s, ez nem elgthet ki, mert a(z) %s csomagnak nincs a "
"verzikvetelmnyt kielgt elrhet verzija."
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s fggsget %s csomaghoz nem lehet kielgteni: %s teleptett csomag tl "
"friss."
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s fggsget %s csomaghoz nem lehet kielgteni: %s "
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s ptsi fggsgei nem elgthetek ki."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Nem sikerlt az ptsi fggsgeket feldolgozni"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Tmogatott modulok:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1304,23 +1322,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Elrhet informcik egyestse"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Nem sikerlt csveket ltrehozni"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Nem sikerlt a gzipet futtatni "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Hibs archvum"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar ellenrzsszeg nem egyezik, az archvum megsrlt"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ismeretlen a(z) %u TAR fejlc tpus, %s tag"
@@ -1465,8 +1483,8 @@ msgstr "Az info s temp knyvtraknak ugyanazon a fjlrendszeren kell lennik"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Csomaglistk olvassa"
@@ -1546,30 +1564,30 @@ msgstr "Hibs ConfFile szekci a sttusz fjlban. Offszet %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "MD5 rtelmezsi hiba. Offszet %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 "Ez nem egy rvnyes DEB archv, hinyzik a '%s' tag"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Bels hiba, %s tag nem tallhat"
+#: 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 "Ez nem egy rvnyes DEB archv, hinyzik a '%s' tag"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Nem lehet vltani ebbe: %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Bels hiba, a tag nem tallhat"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Nem tallhat rvnyes vezrl fjl"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "rtelmezhetetlen vezrl fjl"
@@ -1667,7 +1685,7 @@ msgstr "Idtllps a kapcsolatban"
msgid "Server closed the connection"
msgstr "A kiszolgl lezrta a kapcsolatot"
-#: 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 "Olvassi hiba"
@@ -1901,6 +1919,14 @@ msgstr "Kapcsolds sikertelen"
msgid "Internal error"
msgstr "Bels hiba"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Nem tallom a fjlt"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "A kapcsolat id eltt befejezdtt"
+
# FIXME
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
@@ -2062,54 +2088,54 @@ msgstr "Nem zrolom '%s' NFS-csatlakoztats zrolsi fjlt"
msgid "Could not get lock %s"
msgstr "Nem sikerlt zrolni: %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "%s nem volt itt, ahogy vrtam"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "%s alfolyamat szegmentlsi hibt okozott."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s alfolyamat hibakddal trt vissza (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s alfolyamat vratlanul kilpett"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Nem lehet megnyitni %s fjlt"
-#: 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 "olvass, mg kellene %lu, de mr az sszes elfogyott"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "rsi hiba"
-#: 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 "rs, mg kirand %lu de ez nem lehetsges"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problma a fjl bezrsakor"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problma a fjl unlinkelsvel"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problma a fjl szinkronizlsakor"
@@ -2194,76 +2220,66 @@ msgstr "Lehetsges verzik"
msgid "Dependency Generation"
msgstr "Fggsggenerls"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nem lehet a(z) %s csomagfjlt feldolgozni (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfjlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibs %s forrslistban (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibs %s forrslistban (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibs %s forrslistban (URI feldolgoz)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "A(z) %lu. sor hibs %s forrslistban (Abszolt dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibs %s forrslistban (dist feldolgoz)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "A(z) %s terjeszt blokk rvnytelen"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s megnyitsa"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor tl hossz %s forrslistban."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibs %s forrslistban (tpus)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "A(z) '%s' tpus nem ismert a(z) %u. sorban a(z) %s forrslistban"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "A(z) %u. sor hibs %s forrslistban (terjeszt id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Ismeretlen terjeszt ID '%s' a(z) %u. sorban a(z) %s forrslistban"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2280,13 +2296,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "A(z) '%s' indexfjltpus nem tmogatott"
-#: 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 "A(z) %s csomagot jra kell telepteni, de nem tallok hozz archvot."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2294,7 +2310,7 @@ msgstr ""
"Hiba, pkgProblemResolver::Resolve srlseket generlt, ezt visszatartott "
"csomagok okozhatjk."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"A problmk nem javthatk, srlt visszatartott csomagok vannak a "
@@ -2334,7 +2350,7 @@ msgstr "A megfelel csomagrendszer tpusa nem hatrozhat meg"
msgid "Unable to stat %s."
msgstr "%s nem rhet el."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Nhny 'source' URI-t bele kell tenned a sources.list fjlodba"
@@ -2441,16 +2457,20 @@ msgstr "Nem lehet a(z) %s forrs csomaglistjt elrni"
msgid "Collecting File Provides"
msgstr "\"Elkszt\" kapcsolatok sszegyjtse"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "IO hiba a forrs-gyorsttr mentsekor"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen tnevezs, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Az MD5Sum nem megfelel"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2459,7 +2479,7 @@ msgstr ""
"Nem talltam egy fjlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kzileg "
"kell kijavtani a csomagot. (hinyz arch. miatt)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2468,25 +2488,114 @@ msgstr ""
"Nem talltam egy fjlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kzileg "
"kell kijavtani a csomagot."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fjlok megsrltek. Nincs Filename: mez a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "A mret nem megfelel"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Az MD5Sum nem megfelel"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "A(z) %s terjeszt blokk rvnytelen"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Nem tallom a fjlt"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "A kapcsolat id eltt befejezdtt"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Vrakozs a fejlcekre"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Csomaglistk olvassa"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "A(z) %u. sor tl hossz %s forrslistban."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Ismeretlen terjeszt ID '%s' a(z) %u. sorban a(z) %s forrslistban"
diff --git a/po/it.po b/po/it.po
index d6ca44a37..8ee0c0eb8 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-13 11:30+0100\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -145,14 +145,14 @@ msgstr " Tabella Versione:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -290,7 +290,7 @@ msgstr ""
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
"\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
@@ -525,7 +525,12 @@ msgstr " %s non ha un campo override\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantainer %s non %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Errore interno, impossibile localizzare il campo %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Impossibile allocare memoria"
@@ -619,7 +624,7 @@ msgstr "Impossibile rinominare %s in %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
@@ -696,113 +701,126 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi (downgraded), "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Correzione delle dipendenze in corso..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " fallita."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Impossibile correggere le dipendenze"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Impossibile minimizzare l'insieme da aggiornare"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Fatto"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Dipendenze non trovate. Riprovare usando -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "I seguenti pacchetti saranno aggiornati:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Sussistono dei problemi e -y stata usata senza --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "I pacchetti devono essere rimossi ma Remove disabilitata"
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non pu essere letta."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr " necessario prendere %sB/%sB di archivi. \n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr " necessario prendere %sB di archivi. \n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Lo spazio libero in %s non sufficente."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Sussistono dei problemi e -y stata usata senza --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
" stata specificata la modalit Trivial Only ma questa non un'operazione "
"triviale"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "SI, esegui come richiesto!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -813,28 +831,28 @@ msgstr ""
"Per continuare scrivere la frase '%s' \n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Interrotto."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Continuare? [S/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Il download di alcuni file fallito"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalit download-only"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -842,49 +860,49 @@ msgstr ""
"Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update "
"o provare l'opzione --fix-missing"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing su media estraibili non ancora supportato"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Impossibile correggere i pacchetti mancanti"
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Interruzione dell'installazione in corso."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, si sta selezionando %s al posto di %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s stato saltato, perch gi installato e l'aggiornamento non stato "
"impostato.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Installato]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Bisogna esplicitamente sceglierne uno da installare."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -896,49 +914,49 @@ msgstr ""
"disponibile\n"
"da un'altra sorgente\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Comunque il seguente pacchetto lo sostituisce:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Il pacchetto %s non ha candidati da installare"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "La reinstallazione di %s non possibile, non pu esssere scaricato.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s gi alla versione pi recente.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Non stata trovata la release '%s' per '%s'"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Non stata trovata la versione '%s' per '%s'"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versione selezionata %s (%s) per %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Impossibile creare un lock sulla directory di list"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -946,26 +964,26 @@ msgstr ""
"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
"si useranno quelli precedenti."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -973,7 +991,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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 +1003,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:1485
+#: cmdline/apt-get.cc:1538
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,107 +1013,107 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non sufficente"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr " necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr " necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Non stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1104,7 +1122,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1113,31 +1131,31 @@ 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:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s fallita: il pacchetto installato %s troppo nuovo"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossibile soddisfare la dipendenza %s per %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dipendenze di compilazione per %s non possono essere soddisfatte."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione fallito"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Moduli Supportati:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1321,23 +1339,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Aggiornamento delle informazioni disponibili"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Impossibile creare delle pipe"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Impossibile eseguire gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Archivio corrotto"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Checksum di tar fallito, archivio corrotto"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo %u nell'header del tar sconosciuto, member %s"
@@ -1484,8 +1502,8 @@ msgstr "Le directory temp e info devono essere sullo stesso filesystem"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Lettura della lista dei pacchetti in corso"
@@ -1565,30 +1583,30 @@ msgstr "Sezione ConfFile nel file status non corretta. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Errore nel parsing MD5. Offset %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 "Questo non un archivio DEB valido, manca '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Errore interno, impossibile localizzare il campo %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 "Questo non un archivio DEB valido, manca '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Impossibile cambiare su %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Errore interno, impossibile localizzare il member"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Impossibile localizzare un file control valido"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "file control non parsabile"
@@ -1684,7 +1702,7 @@ msgstr "Timeout della connesione"
msgid "Server closed the connection"
msgstr "Il server ha chiuso la connessione"
-#: 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 "Errore di lettura"
@@ -1774,7 +1792,7 @@ msgstr "Trasferimento dei dati fallito, il server ha detto '%s'"
msgid "Query"
msgstr "Query"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Impossibile invocare "
@@ -1920,6 +1938,14 @@ msgstr "Connessione fallita"
msgid "Internal error"
msgstr "Errore interno"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "File Non Trovato"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Connessione chiusa prematuramente"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Impossibile eseguire mmap su un file vuoto"
@@ -2083,54 +2109,54 @@ msgstr "Lock disabilitato per il file di lock %s nfs montato"
msgid "Could not get lock %s"
msgstr "Impossibile ottenere il lock %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "In attesa, per %s ma non era disponibile"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Il sottoprocesso %s terminato inaspettatamente"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Impossibile aprire il file %s"
-#: 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 "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Errore di scrittura"
-#: 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 "scrittura, c'erano ancora %lu da scrivere ma non era possibile"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Si verificato un problema chiudendo il file"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Si verificato un problema rimuovendo il file"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Si verificato un problema sincronizzando il file"
@@ -2216,76 +2242,66 @@ msgstr "Versioni candidate"
msgid "Dependency Generation"
msgstr "Generazione delle dipendenze"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "La riga %lu in %s (URI) non corretta"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "La riga %lu in %s (dist) non corretta"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "La riga %lu in %s (URI parse) non corretta"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "La riga %lu in %s (Absolute dist) non corretta"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "La riga %lu in %s (dist parse) non corretta"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Il blocco Vendor %s non valido"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s in corso"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linea %u troppo lunga nel source list %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La riga %u in %s (type) non corretta"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Il tipo '%s' non riconosciuto alla riga %u nella lista sorgente %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La riga %u in %s (vendor id) non corretta"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "ID vendor '%s', alla linea %u della lista sorgente %s, sconosciuto"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2302,7 +2318,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Il file indice di tipo '%s' non supportato"
-#: 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."
@@ -2310,7 +2326,7 @@ msgstr ""
"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
"archivio per esso."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2318,7 +2334,7 @@ msgstr ""
"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere "
"causato da pacchetti bloccati "
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
@@ -2356,7 +2372,7 @@ msgstr "Impossibile determinare un tipo di sistema di packaging appropriato"
msgid "Unable to stat %s."
msgstr "Impossibile analizzare %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Bisogna inserire alcuni URI di tipo 'source' in sources.list"
@@ -2464,16 +2480,20 @@ msgstr "Impossibile controllare la lista dei pacchetti sorgente %s"
msgid "Collecting File Provides"
msgstr "Il File Collezionato Fornisce"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvataggio del cache sorgente"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Somma MD5 non corrispondente"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2483,7 +2503,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2492,7 +2512,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2500,21 +2520,116 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Somma MD5 non corrispondente"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Il blocco Vendor %s non valido"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "File Non Trovato"
+#: apt-pkg/cdrom.cc:487
+#, fuzzy, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr "Si sta usando il mount point CD-ROM"
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr "Identificazione in corso.. "
+
+#: apt-pkg/cdrom.cc:521
+#, fuzzy, c-format
+msgid "Stored Label: %s \n"
+msgstr "Etichette salvate: '"
+
+#: apt-pkg/cdrom.cc:541
+#, fuzzy, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Si sta usando il mount point CD-ROM"
+
+#: apt-pkg/cdrom.cc:559
+#, fuzzy
+msgid "Unmounting CD-ROM\n"
+msgstr "Smontaggio CD-ROM in corso"
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "In attesa degli header"
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Connessione chiusa prematuramente"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Mounting CD-ROM...\n"
+msgstr "Montaggio CD-ROM in corso"
+
+#: apt-pkg/cdrom.cc:589
+#, fuzzy
+msgid "Scanning Disc for index files..\n"
+msgstr "Scansione del disco alla ricerca di file indice in corso.. "
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+#, fuzzy
+msgid "That is not a valid name, try again.\n"
+msgstr "Questo non è un nome valido, riprovare"
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "Questo disco è chiamato:"
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Lettura della lista dei pacchetti in corso"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Scrittura di una nuova lista sorgenti in corso"
+
+#: apt-pkg/cdrom.cc:737
+#, fuzzy
+msgid "Source List entries for this Disc are:\n"
+msgstr "Le voci lista sorgenti per questo Disco sono:"
+
+#: apt-pkg/cdrom.cc:771
+#, fuzzy
+msgid "Unmounting CD-ROM..."
+msgstr "Smontaggio CD-ROM in corso"
+
+#: 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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "ID vendor '%s', alla linea %u della lista sorgente %s, sconosciuto"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2598,24 +2713,9 @@ msgstr "Connessione chiusa prematuramente"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Impossibile rinominare %s.new in %s"
-#~ msgid "Using CD-ROM mount point "
-#~ msgstr "Si sta usando il mount point CD-ROM"
-
-#~ msgid "Unmounting CD-ROM"
-#~ msgstr "Smontaggio CD-ROM in corso"
-
#~ msgid "Please insert a Disc in the drive and press enter"
#~ msgstr "Inserire un disco nel drive e premere invio"
-#~ msgid "Mounting CD-ROM"
-#~ msgstr "Montaggio CD-ROM in corso"
-
-#~ msgid "Identifying.. "
-#~ msgstr "Identificazione in corso.. "
-
-#~ msgid "Scanning Disc for index files.. "
-#~ msgstr "Scansione del disco alla ricerca di file indice in corso.. "
-
#~ msgid "I found (binary):"
#~ msgstr "Trovati (binary):"
@@ -2636,27 +2736,12 @@ msgstr "Connessione chiusa prematuramente"
#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
#~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'"
-#~ msgid "That is not a valid name, try again "
-#~ msgstr "Questo non è un nome valido, riprovare"
-
-#~ msgid "This Disc is called:"
-#~ msgstr "Questo disco è chiamato:"
-
#~ msgid " '"
#~ msgstr " '"
-#~ msgid "Writing new source list"
-#~ msgstr "Scrittura di una nuova lista sorgenti in corso"
-
-#~ msgid "Source List entries for this Disc are:"
-#~ msgstr "Le voci lista sorgenti per questo Disco sono:"
-
#~ msgid "Repeat this process for the rest of the CDs in your set."
#~ msgstr "Ripetere questo processo per il resto dei CD."
-#~ msgid "Stored Label: '"
-#~ msgstr "Etichette salvate: '"
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/ja.po b/po/ja.po
index fea90ca27..65ccae2a0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.24\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-08-11 23:13+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -147,14 +147,14 @@ msgstr " Сơ֥:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -289,7 +289,7 @@ msgstr ""
" -c=? ꤷեɤߤ\n"
" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "%s ˽񤭹ޤ"
@@ -523,7 +523,12 @@ msgstr " %s override ȥ꤬ޤ\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s ƥʤ %3$s ǤϤʤ %2$s Ǥ\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "顼 %s Ǥޤ"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - γƤ˼Ԥޤ"
@@ -617,7 +622,7 @@ msgstr "%s %s ˥͡ǤޤǤ"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "ɽŸ顼 - %s"
@@ -693,112 +698,125 @@ msgstr ""
"ٹ: ʲԲķѥåޤ\n"
"򤷤褦ȤƤ뤫Ȥ狼ʤϡ¹ԤƤϤޤ!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "åץ졼: %lu ġ󥹥ȡ: %lu ġ"
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "ƥ󥹥ȡ: %lu ġ"
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "󥰥졼: %lu ġ"
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ": %lu ġα: %lu ġ\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ĤΥѥå˥󥹥ȡޤϺƤޤ\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "¸ط褷Ƥޤ..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " Ԥޤ"
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "¸طľȤǤޤ"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "åץ졼ɥåȤǾǤޤ"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " λ"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"ľˤ 'apt-get -f install' ¹Ԥɬפ뤫⤷ޤ"
""
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "̤ΰ¸طޤ-f ץƤ"
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ʲΥѥåϥåץ졼ɤޤ:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "꤬ȯ-y ץ --force-yes ʤǻѤޤ"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ"
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "ɥǥ쥯ȥåǤޤ"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "ΥꥹȤɤळȤǤޤ"
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%2$sB %1$sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Ÿɲä %sB Υǥ̤񤵤ޤ\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ÿ %sB Υǥ̤ޤ\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s ˽ʬʶڡޤ"
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "꤬ȯ-y ץ --force-yes ʤǻѤޤ"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only ꤵޤϴñǤϤޤ"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -809,28 +827,28 @@ msgstr ""
"³Ԥˤϡ'%s' Ȥե졼򥿥פƤ\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Ǥޤ"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "³Ԥޤ? [Y/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s μ˼Ԥޤ %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "ĤΥեμ˼Ԥޤ"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "ɥ꡼⡼ɤǥѥåΥɤλޤ"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -838,49 +856,49 @@ msgstr ""
"ĤΥ֤Ǥޤapt-get update ¹Ԥ뤫 --fix-"
"missing ץդƻƤߤƤ"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing ȥǥ򴹤ϸƱˤϥݡȤƤޤ"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "­ʤѥåľȤǤޤ"
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "󥹥ȡǤޤ"
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "ա%2$s %1$s 򤷤ޤ\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"˥󥹥ȡ뤵Ƥꥢåץ졼ɤꤵƤʤᡢ%s 򥹥å"
"ޤ\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "ѥå %s ϥ󥹥ȡ뤵ƤʤᡢϤǤޤ\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s ϰʲΥѥå󶡤Ƥ벾ۥѥåǤ:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [󥹥ȡѤ]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "󥹥ȡ뤹ѥåŪ򤹤ɬפޤ"
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -891,49 +909,49 @@ msgstr ""
"餯ΥѥåĤʤ⤦ŤʤäƤ뤫\n"
"뤤̤ΥΤߤѤǤʤȤͤޤ\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "ʲΥѥå֤Ƥޤ:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "ѥå %s ˤϥ󥹥ȡ䤬ޤ"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "ɤǤʤᡢ%s κƥ󥹥ȡԲǽǤ\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ϴ˺ǿСǤ\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s' Υ꡼ '%1$s' ĤޤǤ"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' ΥС '%1$s' ĤޤǤ"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s ˤϥС %1$s (%2$s) 򤷤ޤ\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "update ޥɤϰޤ"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "list ǥ쥯ȥå뤳ȤǤޤ"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -941,27 +959,27 @@ msgstr ""
"ĤΥǥåեΥɤ˼Ԥޤ̵뤵줿"
"뤤ϸŤΤѤޤ"
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "顼AllUpgrade ˲ޤ"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "ѥå %s դޤ"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ": ɽ '%2$s' Ф %1$s 򤷤ޤ\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷"
"ޤ:"
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -969,7 +987,7 @@ msgstr ""
"̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ"
"Ƥ)"
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -981,7 +999,7 @@ msgstr ""
"Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n"
"ƤΤȹͤޤ"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -991,107 +1009,107 @@ msgstr ""
"ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n"
""
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "줿ѥå"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "ƥѥå:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "侩ѥå:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "åץ졼ɥѥå򸡽ФƤޤ... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "λ"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s ΥѥåĤޤ"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s ˽ʬʶڡޤ"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB %1$sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr " %s \n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "ĤΥ֤μ˼Ԥޤ"
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ÿޥ '%s' Ԥޤ\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ӥɥޥ '%s' Ԥޤ\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "ҥץԤޤ"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s build-dependency 뤳ȤǤޤ"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ˤ build depends ꤵƤޤ\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1100,7 +1118,7 @@ msgstr ""
"ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط"
"Ǥޤ"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1109,32 +1127,32 @@ msgstr ""
"ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s "
" %1$s ΰ¸طȤǤޤ"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s Build-dependency ȤǤޤǤ"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "build dependency ν˼Ԥޤ"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "ݡȤƤ⥸塼:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1312,23 +1330,23 @@ msgstr "פǤ [I]nstall ټ¹ԤƤ"
msgid "Merging Available information"
msgstr "ǽޡƤޤ"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "ѥפ˼Ԥޤ"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "gzip μ¹Ԥ˼Ԥޤ"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "줿"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "tar åबԤޤ֤Ƥޤ"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "̤Τ TAR إå %u %s"
@@ -1474,8 +1492,8 @@ msgstr "info temp ǥ쥯ȥƱե륷ƥˤʤФʤޤ"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "ѥåꥹȤɤߤǤޤ"
@@ -1555,30 +1573,30 @@ msgstr "status ե ConfFile 󤬤ޤեå %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "MD5 βϥ顼եå %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 "'%s' Фʤᡢ DEB ֤ǤϤޤ"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "顼 %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 "'%s' Фʤᡢ DEB ֤ǤϤޤ"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "%s ѹǤޤǤ"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "顼ФǤޤ"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "եǤޤǤ"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "ϤǤʤե"
@@ -1674,7 +1692,7 @@ msgstr "³ॢ"
msgid "Server closed the connection"
msgstr "Ф³Ǥޤ"
-#: 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 "ɤ߹ߥ顼"
@@ -1763,7 +1781,7 @@ msgstr "ǡž˼Ԥޤб '%s'"
msgid "Query"
msgstr "䤤碌"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "¹ԤǤޤ"
@@ -1907,6 +1925,14 @@ msgstr "³"
msgid "Internal error"
msgstr "顼"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "ե뤬ߤĤޤ"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "³ޤ"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Υե mmap Ǥޤ"
@@ -2066,54 +2092,54 @@ msgstr "nfs ޥȤ줿åե %s ˤϥåѤޤ"
msgid "Could not get lock %s"
msgstr "å %s ǤޤǤ"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "%s ԤޤˤϤޤǤ"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "ҥץ %s ơȿȤޤ"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ҥץ %s 顼 (%u) ֤ޤ"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ҥץ %s ͽλޤ"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "ե %s 򥪡ץǤޤǤ"
-#: 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 "ɤ߹ߤ %lu ĤäƤϤǤĤäƤޤ"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "񤭹ߥ顼"
-#: 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 " %lu 񤭹ɬפޤ񤭹ळȤǤޤǤ"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "եΥ꤬ȯޤ"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "եκ꤬ȯޤ"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "ե sync ꤬ȯޤ"
@@ -2198,76 +2224,66 @@ msgstr "С"
msgid "Dependency Generation"
msgstr "¸ط"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "ѥåե %s ᤹뤳ȤǤޤ (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "ѥåե %s ᤹뤳ȤǤޤ (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ꥹ %2$s %1$lu ܤǤ (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "ꥹ %2$s %1$lu ܤǤ (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ꥹ %2$s %1$lu ܤǤ (URI parse)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "ꥹ %2$s %1$lu ܤǤ (Absolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ꥹ %2$s %1$lu ܤǤ (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "٥֥å %s Ǥ"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s 򥪡ץ󤷤Ƥޤ"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "ꥹ %2$s %1$u ܤĹ᤮ޤ"
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ꥹ %2$s %1$u ܤǤ (type)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ꥹ %3$s %2$u Ԥˤ륿 '%1$s' Ǥ"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "ꥹ %2$s %1$u ܤǤ (vendor id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "ꥹ %3$s %2$u Ԥʥ٥ ID '%1$s' ޤ"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2284,7 +2300,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "ǥåեΥ '%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."
@@ -2292,7 +2308,7 @@ msgstr ""
"ѥå %s ƥ󥹥ȡ뤹ɬפޤΤΥ֤"
"Ĥ뤳ȤǤޤǤ"
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2300,7 +2316,7 @@ msgstr ""
"顼pkgProblemResolver::Resolve ߤޤ餯ѹػߥѥå"
"Ǥ"
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "褹뤳ȤǤޤ󡣲줿ѹػߥѥåޤ"
@@ -2338,7 +2354,7 @@ msgstr "ŬڤʥѥåƥॿפǤޤ"
msgid "Unable to stat %s."
msgstr "%s stat Ǥޤ"
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "sources.list '' URI ꤹɬפޤ"
@@ -2444,16 +2460,20 @@ msgstr "ѥåꥹ %s stat Ǥޤ"
msgid "Collecting File Provides"
msgstr "ե󶡾Ƥޤ"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "å¸ IO 顼ȯޤ"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "͡˼Ԥޤ%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum Ŭ礷ޤ"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2462,7 +2482,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ (¸ߤʤƥΤ)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2471,7 +2491,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ"
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2479,18 +2499,107 @@ msgstr ""
"ѥåǥåե뤬Ƥޤѥå %s Filename: "
"եɤޤ"
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Ŭ礷ޤ"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum Ŭ礷ޤ"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "٥֥å %s Ǥ"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "ե뤬ߤĤޤ"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "³ޤ"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "إåԵǤ"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "ѥåꥹȤɤߤǤޤ"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "ꥹ %2$s %1$u ܤĹ᤮ޤ"
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "ꥹ %3$s %2$u Ԥʥ٥ ID '%1$s' ޤ"
diff --git a/po/ko.po b/po/ko.po
index 3f7847482..53a058d34 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-07-01 22:25+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <cwryu@debian.org>\n"
@@ -143,14 +143,14 @@ msgstr " 버전 테이블:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -285,7 +285,7 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
@@ -519,7 +519,12 @@ msgstr " %s에는 override 항목이 없습니다\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 메모리를 할당하는 데 실패했습니다"
@@ -613,7 +618,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -689,114 +694,127 @@ msgstr ""
"경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n"
"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu개 업그레이드, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "의존성을 바로잡는 중입니다..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " 실패."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "의존성을 바로잡을 수 없습니다"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "업그레이드 집합을 최소화할 수 없습니다"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " 완료"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "다음 꾸러미를 업그레이드할 것입니다:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%s바이트 아카이브를 받아야 합니다.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "%s 안에 충분한 여유 공간이 없습니다."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
"아닙니다."
# 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -807,28 +825,28 @@ msgstr ""
"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "중단."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "계속 하시겠습니까? [Y/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -836,48 +854,48 @@ msgstr ""
"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
"missing 옵션을 줘서 실행해야 할 것입니다."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "빠진 꾸러미를 바로잡을 수 없습니다."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "설치를 중단합니다."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [설치함]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "설치하려면 분명하게 하나를 선택해야 합니다."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -888,49 +906,49 @@ msgstr ""
"해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
"꾸러미를 받아와야 하는 경우일 수도 있습니다.\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "하지만 다음 꾸러미가 대체합니다:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 꾸러미는 이미 최신 버전입니다.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "목록 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -938,26 +956,26 @@ msgstr ""
"일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버"
"전을 대신 사용합니다."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -965,7 +983,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -976,7 +994,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -985,105 +1003,105 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "망가진 꾸러미"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "다음 꾸러미를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1092,7 +1110,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1101,32 +1119,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1302,23 +1320,23 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를
msgid "Merging Available information"
msgstr "이용 가능 꾸러미 정보를 합칩니다"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "파이프 만들기가 실패했습니다"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "gzip 실행이 실패했습니다"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "아카이브가 손상되었습니다"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
@@ -1463,8 +1481,8 @@ msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "꾸러미 목록을 읽는 중입니다"
@@ -1543,30 +1561,30 @@ msgstr "status 파일에서 ConfFile 섹션이 잘못되었습니다. 오프셋
msgid "Error parsing MD5. Offset %lu"
msgstr "MD5 분석에 오류가 있습니다. 오프셋 %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 "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "내부 오류, %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 "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "%s 디렉토리로 이동할 수 없습니다"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "내부 오류, 멤버를 찾을 수 없습니다"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "올바른 control 파일을 찾는 데 실패했습니다"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "control 파일을 파싱할 수 없습니다"
@@ -1662,7 +1680,7 @@ msgstr "연결 시간 초과"
msgid "Server closed the connection"
msgstr "서버에서 연결을 닫았습니다"
-#: 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 "읽기 오류"
@@ -1751,7 +1769,7 @@ msgstr "데이터 전송 실패, 서버에서는: %s"
msgid "Query"
msgstr "질의"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "다음을 실행할 수 없습니다: "
@@ -1895,6 +1913,14 @@ msgstr "연결이 실패했습니다"
msgid "Internal error"
msgstr "내부 오류"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "파일이 없습니다"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "연결이 너무 빨리 끊어졌습니다"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "빈 파일에 mmap할 수 없습니다"
@@ -2054,54 +2080,54 @@ msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지
msgid "Could not get lock %s"
msgstr "%s 잠금 파일을 얻을 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "%s 파일을 열 수 없습니다"
-#: 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 "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "쓰기 오류"
-#: 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 "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "파일을 닫는 데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "파일을 지우는 데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "파일을 동기화하는 데 문제가 있습니다"
@@ -2186,76 +2212,66 @@ msgstr "후보 버전"
msgid "Dependency Generation"
msgstr "의존성 만들기"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "벤더 블럭 %s이(가) 잘못되었습니다"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s 파일을 여는 중입니다"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "소스 리스트 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "소스 리스트 %3$s의 %2$u번 줄의 벤더 ID '%1$s'을(를) 알 수 없습니다"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2272,14 +2288,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "인덱스 파일 타입 '%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 ""
"%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2287,7 +2303,7 @@ msgstr ""
"오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수"
"도 있습니다."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다."
@@ -2325,7 +2341,7 @@ msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다"
msgid "Unable to stat %s."
msgstr "%s의 정보를 읽을 수 없습니다."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
@@ -2425,16 +2441,20 @@ msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다"
msgid "Collecting File Provides"
msgstr "파일에서 제공하는 것을 모으는 중입니다"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum이 맞지 않습니다"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2443,7 +2463,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2452,25 +2472,114 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum이 맞지 않습니다"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "벤더 블럭 %s이(가) 잘못되었습니다"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "파일이 없습니다"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "연결이 너무 빨리 끊어졌습니다"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "헤더를 기다리는 중입니다"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "꾸러미 목록을 읽는 중입니다"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "소스 리스트 %3$s의 %2$u번 줄의 벤더 ID '%1$s'을(를) 알 수 없습니다"
diff --git a/po/nb.po b/po/nb.po
index 983e2bec5..c6fdf83c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -160,7 +160,7 @@ msgstr " Versjonstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 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
#, c-format
@@ -1700,7 +1700,7 @@ msgstr "Tidsavbrudd p forbindelsen"
msgid "Server closed the connection"
msgstr "Tjeneren lukket forbindelsen"
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "Lesefeil"
@@ -2100,54 +2100,54 @@ msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s"
msgid "Could not get lock %s"
msgstr "Fr ikke lst %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Ventet p %s, men den ble ikke funnet"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprosessen %s mottok et minnefeilsignal."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s ga en feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avsluttet uventet"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke pne fila %s"
-#: 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 "lese, har fremdeles %lu igjen lese, men ingen igjen"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Skrivefeil"
-#: 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 "skrive, har fremdeles %lu igjen skrive, men klarte ikke "
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problem ved lsing av fila"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problem ved oppheving av lenke til fila"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
@@ -2509,5 +2509,98 @@ msgstr "Feil strrelse"
msgid "Vendor block %s contains no fingerprint"
msgstr "Utgivers blokk %s er ugyldig"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Venter p hoder"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Leser pakkelister"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Linje %u i kildelista %s er for lang"
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Ukjent selger ID %s i linje %u i kildelista %s"
diff --git a/po/nl.po b/po/nl.po
index 7f0ab666d..4b533dc37 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-17 23:36+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -146,14 +146,14 @@ msgstr " Versietabel:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -290,7 +290,7 @@ msgstr ""
" -c=? Lees dit configuratiebestand.\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
@@ -527,7 +527,12 @@ msgstr " %s heeft geen voorrangsingang\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Interne fout, kon lokaal onderdeel %s niet vinden"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Geheugentoewijzing is mislukt"
@@ -621,7 +626,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -697,110 +702,123 @@ msgstr ""
"WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n"
"Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten genstalleerd, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw genstalleerd, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Vereisten worden verbeterd..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " mislukt."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Kan vereisten niet verbeteren"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Klaar"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "De volgende pakketten zullen opgewaardeerd worden:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ja, doe wat ik zeg!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -811,28 +829,28 @@ msgstr ""
"Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Afbreken."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Wilt u doorgaan? [J/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -840,49 +858,49 @@ msgstr ""
"Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
"fix-missing proberen?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Geen oplossing voor de missende pakketten gevonden."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Installatie wordt afgebroken."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s wordt overgeslagen, het is al genstalleerd en opwaardering is niet "
"gevraagd.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakket %s is niet genstalleerd, en wordt dus niet verwijderd\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Genstalleerd]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "U dient er n expliciet te selecteren voor installatie."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -893,50 +911,50 @@ msgstr ""
"een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
"verouderd is, of enkel beschikbaar is van een andere bron\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Echter, de volgende pakketten vervangen dit:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakket %s heeft geen installeerbare kandidaat"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s is reeds de nieuwste versie.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' voor '%s' is niet gevonden"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versie '%s' voor '%s' is niet gevonden"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -944,27 +962,27 @@ msgstr ""
"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
"zijn oudere versies van gebruikt."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -972,7 +990,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:1477
+#: cmdline/apt-get.cc:1530
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -983,7 +1001,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -993,109 +1011,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:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1104,7 +1122,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1113,32 +1131,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1325,23 +1343,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "De beschikbare informatie wordt samengevoegd"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Aanmaken pijp is mislukt"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Uitvoeren van gzip is mislukt "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Beschadigd archief"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
@@ -1487,8 +1505,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Pakketlijsten worden ingelezen"
@@ -1568,30 +1586,30 @@ msgstr "Foute 'ConfFile'-sectie in het statusbestand. Regel %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Fout bij het parsen van de MD5. regel %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 "Dit is geen geldig DEB archief, het onderdeel '%s' mankeert"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Interne fout, kon lokaal onderdeel %s niet vinden"
+#: 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 "Dit is geen geldig DEB archief, het onderdeel '%s' mankeert"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Kon niet wijzigen naar %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Interne fout, kon onderdeel niet vinden"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Localiseren van een geldig 'control'-bestand is mislukt"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Niet-ontleedbaar 'control'-bestand"
@@ -1688,7 +1706,7 @@ msgstr "Verbinding is verlopen"
msgid "Server closed the connection"
msgstr "Verbinding is verbroken door de server"
-#: 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 "Leesfout"
@@ -1777,7 +1795,7 @@ msgstr "Data transfer is mislukt, server zei: %s"
msgid "Query"
msgstr "Zoekopdracht"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Aanroepen mislukt van "
@@ -1924,6 +1942,14 @@ msgstr "Verbinding mislukt"
msgid "Internal error"
msgstr "Interne fout"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Bestand niet gevonden"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Verbinding werd voortijdig afgebroken"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Kan een leeg bestand niet mmappen"
@@ -2090,54 +2116,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr "Kon vergrendeling %s niet verkrijgen"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Subproces %s ontving een segmentatiefout."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subproces %s gaf de foutcode %u terug"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subproces %s sloot onverwacht af"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Kon het bestand %s niet openen"
-#: 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 "lees, de laatste te lezen %lu zijn niet beschikbaar"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Schrijffout"
-#: 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 "schrijf, de laatste %lu konden niet weggeschreven worden"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Probleem bij het afsluiten van het bestand"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Probleem bij het ontlinken van het bestand"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
@@ -2222,76 +2248,66 @@ msgstr "Kandidaat-versies"
msgid "Dependency Generation"
msgstr "Generatie vereisten"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kon pakketbestand %s niet ontleden (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Misvormde regel %lu in bronlijst %s (Absolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Verkopersblok %s is ongeldig"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' is onbekend op regel %u in bronlijst %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2309,7 +2325,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexbestandtype '%s' wordt niet ondersteund"
-#: 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."
@@ -2317,7 +2333,7 @@ msgstr ""
"Pakket %s moet opnieuw genstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2325,7 +2341,7 @@ msgstr ""
"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
"veroorzaakt worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast."
@@ -2363,7 +2379,7 @@ msgstr "Kan geen geschikt pakketsysteemtype bepalen"
msgid "Unable to stat %s."
msgstr "Kan de status van %s niet opvragen."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Uw bronnenlijst (/etc/apt/sources.list) dient minstens 1 bron-URI te bevatten"
@@ -2469,16 +2485,20 @@ msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
msgid "Collecting File Provides"
msgstr "Voorziene bestanden worden verzameld"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum komt niet overeen"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2487,7 +2507,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2496,7 +2516,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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2504,18 +2524,107 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum komt niet overeen"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Verkopersblok %s is ongeldig"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Bestand niet gevonden"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Verbinding werd voortijdig afgebroken"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Wachtend op de kopteksten"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Pakketlijsten worden ingelezen"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Regel %u van de bronlijst %s is te lang."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s"
diff --git a/po/nn.po b/po/nn.po
index 60ff744eb..58a62f001 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-09-04 17:51+0200\n"
"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -148,14 +148,14 @@ msgstr " Versjonstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -290,7 +290,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
@@ -520,7 +520,12 @@ msgstr " %s har inga overstyringsoppfring\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Intern feil, fann ikkje medlemmen %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Klarte ikkje tildela minne"
@@ -614,7 +619,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -690,112 +695,125 @@ msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte p nytt, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Rettar p krav ..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " mislukkast."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Klarte ikkje retta p krav"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Klarte ikkje minimera oppgraderingsmengda"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Ferdig"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
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:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Dei flgjande pakkane vil verta oppgraderte:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "M henta %sB/%sB med arkiv.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "M henta %sB med arkiv.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Trivial Only var spesifisert, men dette er ikkje noka triviell handling."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ja, gjer som eg seier!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -806,28 +824,28 @@ msgstr ""
"For halda fram, m du skriva nyaktig %s.\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Avbryt."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Vil du halda fram? [J/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -835,49 +853,49 @@ msgstr ""
"Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller "
"--fix-missing."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og byte av medium er ikkje sttta for tida"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Klarte ikkje retta opp manglande pakkar."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Avbryt installasjon."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Merk, vel %s i staden for %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar over %s, for den er installert fr fr og ikkje sett til "
"oppgradering.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Du m velja ein som skal installerast."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -888,49 +906,49 @@ msgstr ""
"av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n"
"eller er berre tilgjengeleg fr ei anna kjelde\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Dei flgjande pakkane kan brukast i staden:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Det finst ingen installasjonskandidat for pakken %s"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgva %s av %s"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen %s av %s"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -938,26 +956,26 @@ msgstr ""
"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
"filer er brukte i staden."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -965,7 +983,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -977,7 +995,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -987,112 +1005,112 @@ msgstr ""
"pakken rett og slett ikkje lt seg installera. I sfall br du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, 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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1101,31 +1119,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1301,23 +1319,23 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt."
msgid "Merging Available information"
msgstr "Flettar informasjon om tilgjengelege pakkar"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Klarte ikkje oppretta ryr"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Klarte ikkje kyra gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "ydelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjend TAR-hovud type %u, medlem %s"
@@ -1463,8 +1481,8 @@ msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Les pakkelister"
@@ -1544,30 +1562,30 @@ msgstr "ydelagd ConfFile-del i statusfila. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Feil ved tolking av MD5. Offset %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 "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Intern feil, fann ikkje medlemmen %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 "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Klarte ikkje byta til %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Intern feil, fann ikkje medlem"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Fann ikkje noka gyldig kontrollfil"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Kontrollfila kan ikkje tolkast"
@@ -1664,7 +1682,7 @@ msgstr "Tidsavbrot p samband"
msgid "Server closed the connection"
msgstr "Tenaren lukka sambandet"
-#: 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 "Lesefeil"
@@ -1753,7 +1771,7 @@ msgstr "Dataoverfringa mislukkast, tenaren sa %s"
msgid "Query"
msgstr "Sprjing"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Klarte ikkje starta "
@@ -1897,6 +1915,14 @@ msgstr "Sambandet mislukkast"
msgid "Internal error"
msgstr "Intern feil"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Fann ikkje fila"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Sambandet vart uventa stengd"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Kan ikkje utfra mmap p ei tom fil"
@@ -2056,54 +2082,54 @@ msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s"
msgid "Could not get lock %s"
msgstr "Klarte ikkje lsa %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avslutta uventa"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikkje opna fila %s"
-#: 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 "lese, har framleis %lu att lesa, men ingen att"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Skrivefeil"
-#: 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 "skrive, har framleis %lu att skrive, men klarte ikkje"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problem ved lsing av fila"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problem ved oppheving av lenkje til fila"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
@@ -2188,76 +2214,66 @@ msgstr "Kandidatversjonar"
msgid "Dependency Generation"
msgstr "Genererer kravforhold"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Utgjevarblokka %s er ugyldig"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Ukjend utgjevar-ID %s i linja %u i kjeldelista %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2275,13 +2291,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indeksfiltypen %s er ikkje sttta"
-#: 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 "Pakken %s m installerast p nytt, men arkivet finst ikkje."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2289,7 +2305,7 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
@@ -2328,7 +2344,7 @@ msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
msgid "Unable to stat %s."
msgstr "Klarte ikkje f status p %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list."
@@ -2429,16 +2445,20 @@ msgstr "Klarte ikkje f status p kjeldepakkelista %s"
msgid "Collecting File Provides"
msgstr "Samlar inn filtilbod"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Feil MD5-sum"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2447,7 +2467,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2455,25 +2475,114 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, 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:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Feil storleik"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Feil MD5-sum"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Utgjevarblokka %s er ugyldig"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Fann ikkje fila"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Sambandet vart uventa stengd"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Ventar p hovud"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Les pakkelister"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Linja %u i kjeldelista %s er for lang."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Ukjend utgjevar-ID %s i linja %u i kjeldelista %s"
diff --git a/po/pl.po b/po/pl.po
index 054ab430f..3ff738223 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -147,7 +147,7 @@ msgstr " Tabela wersji:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 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
#, c-format
@@ -1694,7 +1694,7 @@ msgstr "Przekroczenie czasu poczenia"
msgid "Server closed the connection"
msgstr "Serwer zamkn poczenie"
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "Bd odczytu"
@@ -2095,54 +2095,54 @@ msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie uyta blokada"
msgid "Could not get lock %s"
msgstr "Nie udao si uzyska blokady %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie byo go"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s spowodowa naruszenie segmentacji."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s zwrci kod bdu (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s zakoczy si niespodziewanie"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Nie udao si otworzy pliku %s"
-#: 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 "naleao przeczyta jeszcze %lu, ale nic nie zostao"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Bd zapisu"
-#: 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 "naleao zapisa jeszcze %lu, ale nie udao si to"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problem przy zamykaniu pliku"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problem przy usuwaniu pliku"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
@@ -2509,5 +2509,98 @@ msgstr "Bdny rozmiar"
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok producenta %s jest nieprawidowy"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Oczekiwanie na nagwki"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Czytanie list pakietw"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Linia %u w licie rde %s jest zbyt duga."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Nieznany identyfikator producenta '%s' w linii %u listy rde %s"
diff --git a/po/pt.po b/po/pt.po
index 5048727d5..fd150815e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-08-26 18:00+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -145,14 +145,14 @@ msgstr " Tabela de Versão:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -288,7 +288,7 @@ msgstr ""
" -c=? Ler este arquivo de configuração\n"
" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -520,7 +520,12 @@ msgstr " %s não possui entrada override\n"
msgid " %s maintainer is %s not %s\n"
msgstr " maintainer de %s é %s, não %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Erro Interno, não foi possível localizar o membro %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Falha ao alocar memória"
@@ -614,7 +619,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -691,111 +696,124 @@ msgstr ""
"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a "
"fazer!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Corrigindo dependências..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Impossível corrigir dependências"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Impossível minimizar o conjunto de actualizações"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Feito"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Você pode querer executar `apt-get -f install' para corrigir isso."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Dependências não satisfeitas. Tente utilizar -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Os seguintes pacotes serão actualizados:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Há problemas e -y foi usado sem --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: 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."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "É necessário fazer o download de %sB de arquivos.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Há problemas e -y foi usado sem --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only especificado mas essa não é uma operação trivial."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -806,28 +824,28 @@ msgstr ""
"Para continuar escreva a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Quer continuar? [S/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -835,47 +853,47 @@ msgstr ""
"Impossível obter alguns arquivos, execute talvez apt-get update ou tente com "
"--fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mídia não são suportados actualmente"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Impossível corrigir os pacotes em falta."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Abortando a Instalação."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, seleccionando %s em vez de %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s não está instalado, então não será removido\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Você deve selecionar explicitamente um para instalar."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -886,51 +904,51 @@ msgstr ""
"Isso pode significar que o pacote falta, ficou obsoleto ou\n"
"está disponível somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "No entanto, os seguintes pacotes substituem-o:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s não tem candidato para instalação"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalação de %s não é possível, o download do mesmo não pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s já é a versão mais recente.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' não foi encontrado"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no directório de listas"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -938,25 +956,25 @@ msgstr ""
"Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -964,7 +982,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -976,7 +994,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -987,109 +1005,109 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, 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:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, 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:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1098,7 +1116,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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1107,32 +1125,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1313,23 +1331,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Juntando informação Disponível"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Falha ao criar pipes"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Falha ao executar gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
@@ -1474,8 +1492,8 @@ msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "A Ler Listas de Pacotes"
@@ -1555,30 +1573,30 @@ msgstr "Secção ConfFile errada no ficheiro de estado. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Erro ao fazer parse ao MD5. Offset %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 "Este não é um arquivo DEB válido, falta o membro '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Erro Interno, não foi possível localizar o membro %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 "Este não é um arquivo DEB válido, falta o membro '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Não foi possível mudar para %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Erro Interno, não foi possível localizar membro"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Falha em localizar um ficheiro de controle válido"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Ficheiro de controle não interpretável"
@@ -1674,7 +1692,7 @@ msgstr "Tempo limite de ligação atingido"
msgid "Server closed the connection"
msgstr "Servidor fechou a ligação"
-#: 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 "Erro de leitura"
@@ -1763,7 +1781,7 @@ msgstr "Transferência de dados falhou, o servidor respondeu '%s'"
msgid "Query"
msgstr "Pesquisa"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Impossível invocar "
@@ -1907,6 +1925,14 @@ msgstr "Falhou a ligação"
msgid "Internal error"
msgstr "Erro interno"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Arquivo não encontrado"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Conexão encerrada prematuramente"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Não é possível fazer mmap a um ficheiro vazio"
@@ -2068,54 +2094,54 @@ msgstr "Não usando locking para ficheiro de lock montado via nfs %s"
msgid "Could not get lock %s"
msgstr "Não foi possível obter lock %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Esperou, por %s mas não estava lá"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir ficheiro o %s"
-#: 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 "leitura, ainda restam %lu para serem lidos mas não resta nenhum"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Erro de escrita"
-#: 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 "gravação, ainda restam %lu para gravar mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problema ao fechar o ficheiro"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problema removendo o link ao ficheiro"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
@@ -2200,76 +2226,66 @@ msgstr "Versões Candidatas"
msgid "Dependency Generation"
msgstr "Geração de Dependência"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossível o parse ao ficheiro de pacote %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossível o parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha malformada %lu na lista de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha malformada %lu na lista de fontes %s (distribuição)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "O bloco de fabricante %s é inválido"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2287,7 +2303,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipo do ficheiro de índice '%s' não é suportado"
-#: 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."
@@ -2295,7 +2311,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2303,7 +2319,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados."
@@ -2342,7 +2358,7 @@ msgstr ""
msgid "Unable to stat %s."
msgstr "Impossível executar stat %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
@@ -2449,16 +2465,20 @@ msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s
msgid "Collecting File Provides"
msgstr "Obtendo File Provides"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum incorreto"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2468,7 +2488,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2477,7 +2497,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2485,21 +2505,111 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum incorreto"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "O bloco de fabricante %s é inválido"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Arquivo não encontrado"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Conexão encerrada prematuramente"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Aguardando por cabeçalhos"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "mas %s está instalado"
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "A Ler Listas de Pacotes"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Linha %u é demasiado longa na lista de fontes %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2555,10 +2665,6 @@ msgstr "Conexão encerrada prematuramente"
#~ "pressione enter\n"
#, fuzzy
-#~ msgid "This Disc is called:"
-#~ msgstr "mas %s está instalado"
-
-#, fuzzy
#~ msgid "Couldn't determine free space in %s"
#~ msgstr "Desculpe, você não tem espaço suficiente em %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 10ba9f2ff..ff69d16fb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-13 20:08-0200\n"
"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -146,14 +146,14 @@ msgstr " Tabela de Verso:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -290,7 +290,7 @@ msgstr ""
" -c=? Ler esse arquivo de configurao\n"
" -o=? Define uma opo arbitrria de configurao, ex: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Impossvel escrever para %s"
@@ -522,7 +522,12 @@ msgstr " %s no possui entrada override\n"
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s %s, no %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Erro Interno, no foi possvel localizar membro %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Falha ao alocar memria"
@@ -616,7 +621,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilao de regex - %s"
@@ -692,111 +697,124 @@ msgstr ""
"AVISO: Os pacotes essenciais a seguir sero removidos\n"
"Isso NO deve ser feito a menos que voc saiba exatamente o que est fazendo!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desatualizados, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu no atualizados.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes no totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Corrigindo dependncias..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Impossvel corrigir dependncias"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Impossvel minimizar o conjunto de atualizaes"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Pronto"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Voc pode querer rodar `apt-get -f install' para corrigir isso."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Dependncias desencontradas. Tente usar -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Os pacotes a seguir sero atualizados :"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "H problemas e -y foi usado sem --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Impossvel criar lock no diretrio de download"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes no pde ser lida."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr " preciso fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr " preciso fazer o download de %sB de arquivos.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Depois de desempacotamento, %sB adicionais de espao em disco sero usados.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espao em disco sero liberados.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Voc no possui espao suficiente em %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "H problemas e -y foi usado sem --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Triviais Apenas especificado mas essa no uma operao trivial."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Sim, faa o que eu digo!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -807,28 +825,28 @@ msgstr ""
"Para continuar digite a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Quer continuar? [S/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao baixar %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -836,47 +854,47 @@ msgstr ""
"Impossvel pegar alguns arquivos, talvez rodar apt-get update ou tentar com "
"--fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mdia no so suportados atualmente"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Impossvel corrigir pacotes faltosos."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Abortando Instalao."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, selecionando %s ao invs de %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Pulando %s, j est instalado e a atualizao no est configurada.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s no est instalado, ento no ser removido\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "O pacote %s um pacote virtual provido por:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Voc deve selecionar um explicitamente para instalar."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -887,51 +905,51 @@ msgstr ""
"Isso pode significar que o pacote est faltando, ficou obsoleto ou\n"
"est disponvel somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "No entanto, os pacotes a seguir o substituem:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s no tem candidato para instalao"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"A reinstalao de %s no possvel, o download do mesmo no pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s j a verso mais nova.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' no foi encontrada"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verso '%s' para '%s' no foi encontrada"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Verso selecionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "O comando update no leva argumentos"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Impossvel criar lock no diretrio de listas"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -939,25 +957,25 @@ msgstr ""
"Alguns arquivos de ndice falharam no download, eles foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossvel achar pacote %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expresso regular '%s'\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Voc deve querer rodar `apt-get -f install' para corrigir isso:"
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -965,7 +983,7 @@ msgstr ""
"Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma soluo)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -977,7 +995,7 @@ msgstr ""
"distribuio instvel, que alguns pacotes requeridos no foram \n"
"criados ainda ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -987,107 +1005,107 @@ msgstr ""
"esteja simplesmente no instalvel e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "A informao a seguir pode ajudar a resolver a situao:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir sero instalados:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Calculando Atualizao... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossvel encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Voc no possui espao livre suficiente em %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Obter Fonte %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Falha ao fazer o download de alguns arquivos."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construo '%s' falhou.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependncias "
"de construo"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossvel conseguir informaes de dependncia de construo para %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tem dependncias de construo.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1096,7 +1114,7 @@ msgstr ""
"a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no "
"pde ser encontrado"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1105,32 +1123,32 @@ msgstr ""
"a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso "
"disponvel do pacote %s pode satisfazer os requerimentos de verso"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito "
"novo"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependncia %s para %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No foi possvel satisfazer as dependncias de compilao para %s."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependncias de construo"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Mdulos Suportados:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1310,23 +1328,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Mesclando informao Disponvel"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Falha ao criar pipes"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Falha ao executar gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabealho TAR %u desconhecido, membro %s"
@@ -1471,8 +1489,8 @@ msgstr "Os diretrios info e temp precisam estar no mesmo sistema de arquivos"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Lendo Lista de Pacotes"
@@ -1552,30 +1570,30 @@ msgstr "Seo ConfFile ruim no arquivo de estado. Posio %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Erro interpretando MD5. Posio %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 "Este no um arquivo DEB vlido, membro '%s' faltando"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Erro Interno, no foi possvel localizar membro %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 "Este no um arquivo DEB vlido, membro '%s' faltando"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "No foi possvel mudar para %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Erro Interno, no foi possvel localizar membro"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Falha em localizar um arquivo de controle vlido"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Arquivo de controle no interpretvel"
@@ -1671,7 +1689,7 @@ msgstr "Tempo limite de conexo atingido"
msgid "Server closed the connection"
msgstr "Servidor fechou a conexo"
-#: 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 "Erro de leitura"
@@ -1760,7 +1778,7 @@ msgstr "Transferncia de dados falhou, servidor respondeu '%s'"
msgid "Query"
msgstr "Pesquisa"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Impossvel invocar "
@@ -1904,6 +1922,14 @@ msgstr "Conexo falhou."
msgid "Internal error"
msgstr "Erro interno"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Arquivo no encontrado"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Conexo encerrada prematuramente"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "No foi possvel fazer mmap de arquivo vazio"
@@ -2065,54 +2091,54 @@ msgstr "No usando locking para arquivo de trava montado via nfs %s"
msgid "Could not get lock %s"
msgstr "No foi possvel obter trava %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Esperado %s mas este no estava l"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-processo %s recebeu uma falha de segmentao."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-processo %s retornou um cdigo de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "No foi possvel abrir arquivo %s"
-#: 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 "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Erro de gravao"
-#: 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 "gravao, ainda restam %lu para gravar mas no foi possvel"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problema fechando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problema removendo o link do arquivo"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
@@ -2197,76 +2223,66 @@ msgstr "Verses Candidatas"
msgid "Dependency Generation"
msgstr "Gerao de Dependncia"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Impossvel analizar arquivo de pacote %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Impossvel analizar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linha malformada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linha malformada %lu no arquivo de fontes %s (distribuio)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linha malformada %lu no arquivo de fontes %s (anlise de URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuio absoluta)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linha malformada %lu no arquivo de fontes %s (anlise de distribuio)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Bloco Forncedor %s invlido"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na sources.lits %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' no conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2284,7 +2300,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Tipo de arquivo de ndice '%s' no suportado"
-#: 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."
@@ -2292,7 +2308,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas no foi possvel encontrar um "
"repositrio para o mesmo."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2300,7 +2316,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossvel corrigir problemas, voc manteve (hold) pacotes quebrados."
@@ -2339,7 +2355,7 @@ msgstr ""
msgid "Unable to stat %s."
msgstr "Impossvel checar %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Voc deve colocar algumas URIs 'source' em seu sources.list"
@@ -2446,16 +2462,20 @@ msgstr "No foi possvel checar a lista de pacotes fonte %s"
msgid "Collecting File Provides"
msgstr "Coletando File Provides"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar cache fonte"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeao falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum incorreto"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2465,7 +2485,7 @@ msgstr ""
"que voc precisa consertar manualmente este pacote. (devido a arquitetura "
"no especificada)."
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2474,7 +2494,7 @@ msgstr ""
"No foi possvel localizar arquivo para o pacote %s. Isto pode significar "
"que voc precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2482,21 +2502,111 @@ msgstr ""
"Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum incorreto"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Bloco Forncedor %s invlido"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Arquivo no encontrado"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Conexo encerrada prematuramente"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Aguardando por cabealhos"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "mas %s est instalado"
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Lendo Lista de Pacotes"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Linha %u muito longa na sources.lits %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
@@ -2552,10 +2662,6 @@ msgstr "Conexo encerrada prematuramente"
#~ "pressione enter\n"
#, fuzzy
-#~ msgid "This Disc is called:"
-#~ msgstr "mas %s est instalado"
-
-#, fuzzy
#~ msgid "Couldn't determine free space in %s"
#~ msgstr "Desculpe, voc no tem espao suficiente em %s"
diff --git a/po/ro.po b/po/ro.po
index 84fa0dfc0..3eceaf159 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-11-16 01:22+0200\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <romanian>\n"
@@ -147,14 +147,14 @@ msgstr " Versiunea tabelei:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -249,7 +249,8 @@ msgid ""
msgstr ""
"Utilizare: apt-config [opţiuni] comanda\n"
"\n"
-"apt-config este o unealtă simplă pentru citirea fişierului de configurare APT\n"
+"apt-config este o unealtă simplă pentru citirea fişierului de configurare "
+"APT\n"
"\n"
"Comenzi:\n"
" shell - Modul shell\n"
@@ -289,7 +290,7 @@ msgstr ""
" -c=? Citeşte acest fişier de configurare\n"
" -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Nu pot scrie în %s"
@@ -371,21 +372,29 @@ msgstr ""
" generate config [groups]\n"
" clean config\n"
"\n"
-"apt-ftparchive generează fişiere de indexare pentru arhivele Debian. Suportă\n"
+"apt-ftparchive generează fişiere de indexare pentru arhivele Debian. "
+"Suportă\n"
"multe stiluri de generare de la complet automat la înlocuiri funcţionale\n"
"pentru dpkg-scanpackage şi dpkg-scansources\n"
"\n"
"apt-ftparchive generează fişierele pachetelor dintr-un arbore de .deb-uri.\n"
-"Fişierul pachet înglobează conţinutul tuturor câmpurilor de control din fiecare\n"
-"pachet ca şi MD5 hash şi dimensiunea fişierului. Un fişier de înlocuire este\n"
+"Fişierul pachet înglobează conţinutul tuturor câmpurilor de control din "
+"fiecare\n"
+"pachet ca şi MD5 hash şi dimensiunea fişierului. Un fişier de înlocuire "
+"este\n"
"furnizat pentru a forţa valoarea priorităţii şi secţiunii.\n"
"\n"
-"În mod asemănator apt-ftparchive generează fişierele surse dintr-un arbore de .dsc-uri.\n"
-"Opţiunea --source-override poate fi folosită pentru a specifica fişierul de înlocuire\n"
+"În mod asemănator apt-ftparchive generează fişierele surse dintr-un arbore "
+"de .dsc-uri.\n"
+"Opţiunea --source-override poate fi folosită pentru a specifica fişierul de "
+"înlocuire\n"
"\n"
-"Comenzile 'packages' şi 'sources' ar trebui executate în rădăcina arborelui.\n"
-"Binaryparh ar trebui să indice baza căutării recursive şi fişierul de înlocuire ar\n"
-"trebui să conţină semnalizatorul de înlocuire. Prefixul căii este adăugat câmpului\n"
+"Comenzile 'packages' şi 'sources' ar trebui executate în rădăcina "
+"arborelui.\n"
+"Binaryparh ar trebui să indice baza căutării recursive şi fişierul de "
+"înlocuire ar\n"
+"trebui să conţină semnalizatorul de înlocuire. Prefixul căii este adăugat "
+"câmpului\n"
"de nume fişier dacă acesta este prezent. Exemplu de utilizare din arhiva\n"
"Debian:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
@@ -520,7 +529,12 @@ msgstr " %s nu are intrare de înlocuire\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Eroare internă, nu pot localiza membrul %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Eşuare în alocarea memoriei"
@@ -614,7 +628,7 @@ msgstr "Eşuare în a redenumi %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare regex - %s"
@@ -690,110 +704,124 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
"Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de şters şi %lu neînnoite.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau şterse incomplet.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Corectez dependenţele..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " eşuare."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Nu pot corecta dependenţele"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Nu pot micşora setul de înnoire"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Gata"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Dependenţe neîndeplinite. Încercaţi folosirea -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Următoarele pachete vor fi ÎNNOITE:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Este nevoie de %sB/%sB de arhive.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Este nevoie de %sB de arhive.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
+msgstr ""
+"A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Da, fă cum îţi spun!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -804,76 +832,76 @@ msgstr ""
"Pentru a continua tastaţi fraza '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Renunţare."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Vreţi să continuaţi? [Y/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Eşuare în descărcarea unor fişiere"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu "
-"--fix-missing?"
+"Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --"
+"fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Nu pot corecta pachetele lipsă."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Abandonez instalarea."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Notă, selectarea %s în locul lui %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Instalat]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -884,94 +912,96 @@ msgstr ""
"Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n"
"este disponibil numai din altă sursă\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Oricum următoarele pachete îl înlocuiesc:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pachetul %s nu are nici un candidat de instalare"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s are deja cea mai nouă versiune.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Producţia '%s' pentru '%s' n-a fost găsită"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au fost "
-"folosite în loc unele vechi."
+"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au "
+"fost folosite în loc unele vechi."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru regex '%s'\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet (sau "
-"oferiţi o altă soluţie)."
+"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:1477
+#: cmdline/apt-get.cc:1530
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Unele pachete n-au putut fi instalate. Aceasta ar putea însemna că aţi cerut\n"
-"o situaţie imposibilă sau că folosiţi distribuţia instabilă în care unele pachete\n"
+"Unele pachete n-au putut fi instalate. Aceasta ar putea însemna că aţi "
+"cerut\n"
+"o situaţie imposibilă sau că folosiţi distribuţia instabilă în care unele "
+"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -981,105 +1011,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:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Eşuare"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Gata"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, 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:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie de %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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"
+msgstr ""
+"Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele "
+"înglobate"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1088,7 +1120,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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1097,30 +1129,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:2190
+#: cmdline/apt-get.cc:2243
#, 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"
+msgstr ""
+"Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
+"prea nou"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, 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:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1175,7 +1209,8 @@ msgstr ""
" install - Instalează pachete noi (pachet este libc6, nu libc6.deb)\n"
" remove - Şterge pachete\n"
" source - Descarcă arhivele sursă\n"
-" build-dep - Configurează dependenţele înglobate pentru sursele pachetelor\n"
+" build-dep - Configurează dependenţele înglobate pentru sursele "
+"pachetelor\n"
" dist-upgrade - Înnoirea distribuţiei, vedeţi apt-get(8)\n"
" dselect-upgrade - Urmează selecţiile dselect\n"
" clean - Şterge fişierele arhivă descărcate\n"
@@ -1256,14 +1291,16 @@ msgid ""
msgstr ""
"Utilizare: apt-sortpkgs [opţiuni] fişier1 [fişier2 ...]\n"
"\n"
-"apt-sortpkgs este o unealtă simplă pentru sortarea fişierelor pachete. Opţiunea\n"
+"apt-sortpkgs este o unealtă simplă pentru sortarea fişierelor pachete. "
+"Opţiunea\n"
"-s este folosită pentru a indica ce fel de fişier este.\n"
"\n"
"Opţiuni:\n"
" -h Acest text de ajutor\n"
" -s Foloseşte sortarea de fişiere sursă\n"
" -c=? Citeşte acest fişier de configurare\n"
-" -o=? Ajustează o opţiune de configurare arbitrară, ex.: -o dir::cache=/tmp\n"
+" -o=? Ajustează o opţiune de configurare arbitrară, ex.: -o dir::cache=/"
+"tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1280,37 +1317,42 @@ msgstr "S-au produs unele erori în timpul despachetării. Voi configura"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate"
+msgstr ""
+"pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile"
+msgstr ""
+"sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile"
#: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
-msgstr "de deasupra acestui mesaj sunt importante. Vă rog corectaţi-le şi porniţi din nou [I]nstalarea"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"de deasupra acestui mesaj sunt importante. Vă rog corectaţi-le şi porniţi "
+"din nou [I]nstalarea"
#: dselect/update:30
msgid "Merging Available information"
msgstr "Unirea informaţiilor disponibile"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Eşuare în crearea conexiunilor"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Eşuare în executarea gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Arhivă deteriorată"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Eşuare checksum tar, arhivă deteriorată"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tip antet TAR %u necunoscut, membru %s"
@@ -1451,12 +1493,14 @@ msgstr "Eşuare în a determina starea %sinfo"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Directoarele de informaţii şi temporare trebuie să fie în acelaşi sistem de fişiere"
+msgstr ""
+"Directoarele de informaţii şi temporare trebuie să fie în acelaşi sistem de "
+"fişiere"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Citire liste de pachete"
@@ -1536,30 +1580,30 @@ msgstr "Secţiune necorespunzătoare ConfFile în fişierul de stare. Offset %lu
msgid "Error parsing MD5. Offset %lu"
msgstr "Eroare la analiza MD5. Offset %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 "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Eroare internă, nu pot localiza membrul %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 "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Nu pot schimba la %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Eroare internă, nu pot localiza membrul"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Eşuare de localizare a unui fişier de control valid"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Fişier de control neanalizabil"
@@ -1655,7 +1699,7 @@ msgstr "Timpul de conectare a expirat"
msgid "Server closed the connection"
msgstr "Serverul a terminat conexiunea"
-#: 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 "Eroare de citire"
@@ -1744,7 +1788,7 @@ msgstr "Eşuare transfer de date, serverul a spus: '%s'"
msgid "Query"
msgstr "Interogare"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Nu pot invoca"
@@ -1870,7 +1914,8 @@ msgstr "Eroare la scrierea în fişierul"
#: methods/http.cc:832
msgid "Error reading from server Remote end closed connection"
-msgstr "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
+msgstr ""
+"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
#: methods/http.cc:834
msgid "Error reading from server"
@@ -1888,6 +1933,14 @@ msgstr "Conectare eşuată"
msgid "Internal error"
msgstr "Eroare internă"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Fişier negăsit"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Conexiune închisă prematur"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Nu pot mmap un fişier gol"
@@ -1935,7 +1988,8 @@ msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
#: apt-pkg/contrib/configuration.cc:643
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
+msgstr ""
+"Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
#: apt-pkg/contrib/configuration.cc:650
#, c-format
@@ -1991,7 +2045,8 @@ msgstr "Opţiunea %s necesită un argument"
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>."
+msgstr ""
+"Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2047,54 +2102,54 @@ msgstr "Nu este folosit blocajul pentru fişierul montat nfs %s"
msgid "Could not get lock %s"
msgstr "Nu pot determina blocajul %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Aşteptat %s, dar n-a fost acolo"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Subprocesul %s a primit o eroare de segmentare."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subprocesul %s a întors un cod de eroare (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subprocesul %s s-a terminat brusc"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Nu pot deschide fişierul %s"
-#: 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 "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Eroare de scriere"
-#: 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 "scriere, încă mai am %lu de scris dar nu pot"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problemă la închiderea fişierului"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problemă la dezlegarea fişierului"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fişierului"
@@ -2179,76 +2234,66 @@ msgstr "Versiuni candidat"
msgid "Dependency Generation"
msgstr "Generare dependenţe"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Nu pot analiza fişierul pachet %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Nu pot analiza fişierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Linie greşită %lu în lista sursă %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Linie greşită %lu în lista sursă %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Linie greşită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Blocul vânzător %s este invalid"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greşită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Identificator vânzător '%s' necunoscut în linia %u din lista sursă %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2256,29 +2301,32 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"Aceasta instalare va avea nevoie de ştergerea temporară a pachetului esenţial "
-"%s din cauza unui cerc conflict/pre-dependenţă. Asta de multe ori nu-i de bine, "
-"dar dacă vreţi întradevăr s-o faceţi, activaţi opţiunea APT::Force-LoopBreak."
+"Aceasta instalare va avea nevoie de ştergerea temporară a pachetului "
+"esenţial %s din cauza unui cerc conflict/pre-dependenţă. Asta de multe ori "
+"nu-i de bine, dar dacă vreţi întradevăr s-o faceţi, activaţi opţiunea APT::"
+"Force-LoopBreak."
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Tipul de fişier index '%s' nu este suportat"
-#: 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 "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi cauzată "
-"de pachete ţinute."
+"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
+"cauzată de pachete ţinute."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate."
@@ -2316,17 +2364,20 @@ msgstr "Nu pot determina un tip de sistem de pachete potrivit"
msgid "Unable to stat %s."
msgstr "Nu pot determina starea %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Trebuie să puneţi nişte 'surse' de URI în sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
-msgstr "Listele de pachete sau fişierul de stare n-au putut fi analizate sau deschise."
+msgstr ""
+"Listele de pachete sau fişierul de stare n-au putut fi analizate sau "
+"deschise."
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
+msgstr ""
+"Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
@@ -2382,15 +2433,19 @@ msgstr "Eroare în timpul procesării %s (versiune nouă 2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest APT."
+msgstr ""
+"Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest "
+"APT."
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
+msgstr ""
+"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
+msgstr ""
+"Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
#: apt-pkg/pkgcachegen.cc:241
#, c-format
@@ -2405,7 +2460,8 @@ msgstr "Eroare în timpul procesării %s (colectare furnizor fişiere)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
+msgstr ""
+"Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
#: apt-pkg/pkgcachegen.cc:574
#, c-format
@@ -2416,51 +2472,147 @@ msgstr "Nu pot determina starea listei surse de pachete %s"
msgid "Collecting File Provides"
msgstr "Colectare furnizori fişiere"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Nepotrivire MD5Sum"
+
+#: apt-pkg/acquire-item.cc:718
#, 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 ""
-"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ă)"
+"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:388
+#: apt-pkg/acquire-item.cc:771
#, 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 ""
-"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna că "
-"aveţi nevoie să depanaţi manual acest pachet."
+"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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
-msgstr "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la pachetul %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
+"pachetul %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Nepotrivire MD5Sum"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blocul vânzător %s este invalid"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Fişier negăsit"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Conexiune închisă prematur"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "În aşteptarea antetelor"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Citire liste de pachete"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Linia %u prea lungă în lista sursă %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "Identificator vânzător '%s' necunoscut în linia %u din lista sursă %s"
diff --git a/po/ru.po b/po/ru.po
index e10695df6..ada977e90 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2004-09-09 19:44+0400\n"
"Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -158,14 +158,14 @@ msgstr " Таблица версий:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпилирован %s %s\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -299,7 +299,7 @@ msgstr ""
" -c=? Читать указанный конфигурационный файл\n"
" -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
@@ -327,7 +327,8 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:367
msgid "Error writing header to contents file"
-msgstr "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
+msgstr ""
+"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
#: ftparchive/apt-ftparchive.cc:397
#, c-format
@@ -540,7 +541,12 @@ msgstr " Нет записи о переназначении (override) для
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Внутренняя ошибка, не могу найти составную часть %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - не удалось выделить память"
@@ -577,7 +583,8 @@ msgstr "Неизвестный алгоритм сжатия '%s'"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Для получения сжатого вывода %s необходимо включить использования сжатия"
+msgstr ""
+"Для получения сжатого вывода %s необходимо включить использования сжатия"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
@@ -634,7 +641,7 @@ msgstr "Не удалось переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
@@ -695,7 +702,8 @@ msgstr "Пакеты, будут заменены на более СТАРЫЕ
#: cmdline/apt-get.cc:483
msgid "The following held packages will be changed:"
-msgstr "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
#: cmdline/apt-get.cc:536
#, c-format
@@ -710,114 +718,129 @@ msgstr ""
"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n"
"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, установлено %lu новых пакетов, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "переустановлено %lu переустановлено, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на старые версии, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не установлено до конца или удалено %lu пакетов.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Исправление зависимостей..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " не удалось."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Невозможно скорректировать зависимости"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Невозможно минимизировать набор обновлений"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Готово"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install'."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Пакеты, которые будут обновлены:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Существуют проблемы, а опция -y использована без --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Пакеты необходимо удалить, но удаление запрещено."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог для загрузки"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Необходимо скачать %sB/%sB архивов.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Необходимо скачать %sБ архивов.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
+msgstr ""
+"После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
+msgstr ""
+"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Недостаточно свободного места в %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Существуют проблемы, а опция -y использована без --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"Запрошено выполнение только тривиальных операций, но это не тривиальная "
"операция."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Да, делать, как я скажу!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -828,28 +851,28 @@ msgstr ""
"Чтобы продолжить, введите фразу: '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Аварийное завершение."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Хотите продолжить? [Д/н] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось загрузить %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Некоторые файлы не удалось загрузить"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -857,47 +880,48 @@ msgstr ""
"Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get "
"update или попытаться повторить запуск с ключом --fix-missing"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Аварийное завершение установки."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
+msgstr ""
+"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Установлен]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Вы должны явно указать, какой именно вы хотите установить."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -908,49 +932,49 @@ msgstr ""
"Это может означать, что пакет отсутствует, устарел, или доступен из "
"источников, не упомянутых в sources.list\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Однако следующие пакеты могут его заменить:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Для пакета %s не найдены кандидаты на установку"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Переустановка %s невозможна, он не загружается.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Уже установлена самая новая версия %s.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Релиз '%s' для '%s' не найден"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версия '%s' для '%s' не найдена"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана версия %s (%s) для %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Невозможно заблокировать каталог со списками пакетов"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -958,27 +982,27 @@ msgstr ""
"Некоторые индексные файлы не загрузились, они были проигнорированы или "
"вместо них были использованы старые версии"
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Не могу найти пакет %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -986,7 +1010,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -997,7 +1021,7 @@ msgstr ""
"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
"ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -1007,111 +1031,111 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация возможно поможет Вам:"
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Настойчиво рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Рассчёт обновлений... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
"тексты"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось загрузить."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1120,7 +1144,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1129,32 +1153,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1319,10 +1343,12 @@ msgstr "установленных пакетов. Это может приве
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "возникновению новых из-за неудовлетворённых зависимостей. Это нормально,"
+msgstr ""
+"возникновению новых из-за неудовлетворённых зависимостей. Это нормально,"
#: 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 ""
"важны только ошибки, указанные выше. Исправьте их и выполните установку ещё "
"раз"
@@ -1331,23 +1357,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Объединение информации о доступных пакетах"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Не удалось создать порождённые процессы"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Не удалось выполнить gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Повреждённый архив"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Неправильная контрольная сумма Tar, архив повреждён"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
@@ -1492,8 +1518,8 @@ msgstr "Каталоги info и temp должны находиться на о
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Чтение списков пакетов"
@@ -1572,30 +1598,30 @@ msgstr "Неверная секция ConfFile в status-файле. Смеще
msgid "Error parsing MD5. Offset %lu"
msgstr "Ошибка чтения контрольной суммы. Смещение %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 "Это неправильный DEB-архив - отсутствует составная часть '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Внутренняя ошибка, не могу найти составную часть %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 "Это неправильный DEB-архив - отсутствует составная часть '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Не могу перейти в каталог %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Внутренняя ошибка, не могу найти составную часть"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Не могу найти правильный control-файл"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Не могу прочесть содержимое control-файла"
@@ -1693,7 +1719,7 @@ msgstr "Допустимое время ожидания для соединен
msgid "Server closed the connection"
msgstr "Сервер прервал соединение"
-#: 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 "Ошибка чтения"
@@ -1784,7 +1810,7 @@ msgstr "Передача данных завершилась неудачно,
msgid "Query"
msgstr "Запрос"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Невозможно вызвать "
@@ -1838,7 +1864,8 @@ msgstr "Временная ошибка при попытке получить I
#: methods/connect.cc:169
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
+msgstr ""
+"Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
#: methods/connect.cc:216
#, c-format
@@ -1928,6 +1955,14 @@ msgstr "Соединение разорвано"
msgid "Internal error"
msgstr "Внутренняя ошибка"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Файл не найден"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Соединение закрыто преждевременно"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Невозможно отобразить в память пустой файл"
@@ -2093,54 +2128,56 @@ msgstr ""
msgid "Could not get lock %s"
msgstr "Не могу получить доступ к файлу блокировки %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
+msgstr ""
+"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Порождённый процесс %s неожиданно завершился"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Не могу открыть файл %s"
-#: 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 "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
+msgstr ""
+"ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Ошибка записи"
-#: 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 "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Проблема закрытия файла"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Ошибка при удалении файла"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файловых буферов с диском"
@@ -2225,76 +2262,67 @@ msgstr "Версии-кандидаты"
msgid "Dependency Generation"
msgstr "Генерирование зависимостей"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Невозможно прочесть содержимое пакета %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Невозможно прочесть содержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Искажённая строка %lu в списке источников %s (Absolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Неверный поставщик %s"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Неизвестен тип '%s' в строке %u в списке источников %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Искажённая строка %u в списке источников %s (vendor id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Неизвестный ID поставщика '%s' в строке %u списка источников %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2312,12 +2340,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Не поддерживается индексный файл типа '%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."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2325,7 +2354,7 @@ msgstr ""
"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты."
@@ -2363,7 +2392,7 @@ msgstr "Невозможно определить подходящий тип м
msgid "Unable to stat %s."
msgstr "Невозможно получить атрибуты %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Вы должны заполнить sources.list, поместив туда URI источников пактов"
@@ -2463,16 +2492,20 @@ msgstr "Не удалось получить атрибуты списка па
msgid "Collecting File Provides"
msgstr "Сбор информации о Provides"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum не совпадает"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2481,7 +2514,7 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2490,24 +2523,113 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, 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 "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Не совпадает размер"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5Sum не совпадает"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Неверный поставщик %s"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Файл не найден"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Соединение закрыто преждевременно"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Ожидание заголовков"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Чтение списков пакетов"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Строка %u в списке источников %s слишком длинна."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Неизвестный ID поставщика '%s' в строке %u списка источников %s"
diff --git a/po/sk.po b/po/sk.po
index 24bc4f047..82395a3c8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-12 08:17+0100\n"
"Last-Translator: Peter KLFMANiK Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -146,14 +146,14 @@ msgstr " Tabuľka verzií:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -288,7 +288,7 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
@@ -519,7 +519,12 @@ msgstr " %s nemá žiadnu položku pre override\n"
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
@@ -613,7 +618,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -689,110 +694,123 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, čo robíte, tak to NEROBTE!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových inštalovaných, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Opravujú sa závislosti..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " zlyhalo."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Závislosti sa nedajú opraviť"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Sada pre aktualizáciu sa nedá minimalizovať"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Na opravu môžete spustiť `apt-get -f install'."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplnené závislosti. Skúste použiť -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Nasledovné balíky sa aktualizujú:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Nastali problémy a -y bolo použité bez --force-yes"
+
+#: cmdline/apt-get.cc:762
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:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Je potrebné stiahnuť %sB archívov.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení sa na disku použije ďalších %sB.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Nastali problémy a -y bolo použité bez --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Áno, urob to, čo vravím!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -803,28 +821,28 @@ msgstr ""
"Pre pokračovanie opíšte frázu '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Prerušené."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Chcete pokračovať? [Y/n] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -832,47 +850,47 @@ msgstr ""
"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
"fix-missing"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výmena média nie sú momentálne podporované"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Chýbajúce balíky sa nedajú opraviť."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Inštalácia sa prerušuje."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Poznámka: %s sa vyberá namiesto %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuálny balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr "[Inštalovaný]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -882,49 +900,49 @@ msgstr ""
"Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
"že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Avšak nahrádzajú ho nasledovné balíky:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta na inštaláciu"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je už najnovšej verzie.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebolo nájdené vydanie '%s' pre '%s'"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia '%s' pre '%s'"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -932,25 +950,25 @@ msgstr ""
"Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa "
"použili staršie verzie."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, 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:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -958,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:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -970,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -980,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:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, 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:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, 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:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, 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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1096,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1296,23 +1314,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Zlučujú sa dostupné informácie"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Vytvorenie rúry zlyhalo"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Spustenie gzip zlyhalo "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Porušený archív"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznáma hlavička TARu typ %u, člen %s"
@@ -1457,8 +1475,8 @@ msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Načítavajú sa zoznamy balíkov"
@@ -1538,30 +1556,30 @@ msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Chyba pri spracovaní MD5. Offset %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 "Toto nie je platný DEB archív, chýba časť '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Vnútorná chyba, nedá sa nájsť časť %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 "Toto nie je platný DEB archív, chýba časť '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Nedá sa prejsť do %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Vnútorná chyba, nedá sa nájsť člen"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Nedá sa nájsť platný riadiaci súbor"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Nespracovateľný riadiaci súbor"
@@ -1657,7 +1675,7 @@ msgstr "Uplynul čas spojenia"
msgid "Server closed the connection"
msgstr "Server ukončil spojenie"
-#: 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 "Chyba pri čítaní"
@@ -1746,7 +1764,7 @@ msgstr "Prenos dát zlyhal, server odpovedal '%s'"
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
@@ -1890,6 +1908,14 @@ msgstr "Spojenie zlyhalo"
msgid "Internal error"
msgstr "Vnútorná chyba"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Súbor nebol nájdený"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Spojenie bolo predčasne ukončené"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Nedá sa vykonať mmap prázdneho súboru"
@@ -2050,54 +2076,54 @@ msgstr "Zamykanie pre zámkový súbor %s pripojený cez nfs sa nepoužíva"
msgid "Could not get lock %s"
msgstr "Zámok %s sa nedá získať"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s obdržal chybu segmentácie."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočakávane skončil"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Súbor %s sa nedá otvoriť súbor"
-#: 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 "čítanie, stále treba prečítať %lu, ale už nič neostáva"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Chyba pri zápise"
-#: 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 "zápis, stále treba zapísať %lu, no nedá sa to"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problém pri zatváraní súboru"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problém pri odstraňovaní súboru"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
@@ -2182,76 +2208,66 @@ msgstr "Kandidátske verzie"
msgid "Dependency Generation"
msgstr "Generovanie závislostí"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Súbor %s sa nedá spracovať (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Súbor %s sa nedá spracovať (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Blok výrobcu %s je neplatný"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2268,13 +2284,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexový typ súboru '%s' nie je podporovaný"
-#: 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 "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2282,7 +2298,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v narušenom stave."
@@ -2320,7 +2336,7 @@ msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému"
msgid "Unable to stat %s."
msgstr "Nedá sa vyhodnotiť %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Do sources.list musíte zadať nejaké 'zdrojové' URI"
@@ -2422,16 +2438,20 @@ msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Nezhoda MD5 súčtov"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2440,7 +2460,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2449,24 +2469,113 @@ 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:419
+#: apt-pkg/acquire-item.cc:807
#, 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:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Nezhoda MD5 súčtov"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobcu %s je neplatný"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Súbor nebol nájdený"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Spojenie bolo predčasne ukončené"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Čaká sa na hlavičky"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s"
diff --git a/po/sl.po b/po/sl.po
index a2af9f09a..b879ff5e5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -143,7 +143,7 @@ msgstr " Tabela razliic:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 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
#, c-format
@@ -1674,7 +1674,7 @@ msgstr "Povezava potekla"
msgid "Server closed the connection"
msgstr "Strenik je zaprl povezavo"
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "Napaka pri branju"
@@ -2075,54 +2075,54 @@ msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
msgid "Could not get lock %s"
msgstr "Ni mogoe dobiti zaklenjene datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "akal, a %s ni bil tam"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Napaka pri razlenjenosti podprocesa %s."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s je vrnil kodo napake (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s se je nepriakovano zakljuil"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Ne morem odpreti datoteke %s"
-#: 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 "berem, e vedno %lu za branje, a nobeden ostal"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Napaka pri pisanju"
-#: 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 "piem, e vedno %lu za pisanje, a ni mogoe"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Teava pri zapiranju datoteke"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Teava pri odvezovanju datoteke"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Teava pri usklajevanju datoteke"
@@ -2484,5 +2484,98 @@ msgstr "Neujemanje velikosti"
msgid "Vendor block %s contains no fingerprint"
msgstr "Ponudnikov blok %s je neveljaven"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "akanje na glave"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Branje seznama paketov"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Vrstica %u v seznamu virov %s je predolga."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s"
diff --git a/po/sv.po b/po/sv.po
index 39f104452..707a37d05 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\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"
@@ -148,14 +148,14 @@ msgstr " Versionstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -290,7 +290,7 @@ msgstr ""
" -c=? Ls denna instllningsfil.\n"
" -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -526,7 +526,12 @@ msgstr " %s har ingen post i override-filen\n"
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig fr %s r %s ej %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Internt fel, kunde inta hitta delen %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Misslyckades att allokera minne"
@@ -622,7 +627,7 @@ msgstr "Misslyckades att byta namn p %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljrt uttryck - %s"
@@ -698,110 +703,123 @@ msgstr ""
"VARNING: Fljande systemkritiska paket kommer att tas bort\n"
"Detta br INTE gras svida du inte vet precis vad du gr!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu uppgraderade, %lu nyinstallerade, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ominstallerade, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderade, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu ej uppgraderade.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ej helt installerade eller borttagna.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Rttar beroenden...."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " misslyckades."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Kunde inte rtta beroenden"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Kunde inte minimera uppgraderingsuppsttningen"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan mjligen rtta dessa genom att kra \"apt-get -f install\"."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "Otillfredsstllda beroenden. Frsk med -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Fljande paket kommer att uppgraderas:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Problem har uppsttt och -y anvndes utan --force-yes"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Kunde inte lsa hmtningskatalogen."
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Behver hmta %sB/%sB arkiv.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Behver hmta %sB arkiv.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigras p disken.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Problem har uppsttt och -y anvndes utan --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "\"Trivial Only\" angavs, men detta r inte en trivial handling."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ja, gr som jag sger!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -813,28 +831,28 @@ msgstr ""
" ?] "
# Visas d man svarar nej
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Vill du fortstta? [J/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades att hmta %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Misslyckades att hmta vissa filer"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Hmtningen frdig i \"endast-hmta\"-lge"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -842,48 +860,48 @@ msgstr ""
"Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med "
"--fix-missing."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing och mediabyte stds inte nnu"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Kunde inte rtta saknade paket."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Avbryter installationen."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Observera, vljer %s istllet fr %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paketet %s r inte installerat, s tas inte bort\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketet %s r ett virtuellt paket som tillhandahlls av:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Installerat]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Du br explicit ange ett att installera."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -894,49 +912,49 @@ msgstr ""
"Detta betyder vanligen att paketet saknas, har blivit frldrat eller\n"
"bara r tillgngligt frn andra kllor\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Dock kan fljande paket erstta det:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketet %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ominstallation av %s r inte mjlig, det kan inte hmtas.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s r redan den senaste versionen.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgvan \"%s\" fr \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" fr \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) fr %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Kunde inte lsa listkatalogen"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -944,25 +962,25 @@ msgstr ""
"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla "
"anvnts istllet."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, vljer %s fr regex \"%s\"\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -970,7 +988,7 @@ msgstr ""
"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
"(eller ange en lsning)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -982,7 +1000,7 @@ msgstr ""
"distributionen, att ngra krvda paket nnu inte har skapats eller\n"
"lagts in frn \"Incoming\"."
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -992,105 +1010,105 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta br\n"
"skrivas."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Fljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Freslagna paket:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Berknar uppgradering... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta ngot kllkodspaket fr %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, 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:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behver hmta %sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Hmtar kllkod %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Misslyckades att hmta vissa arkiv."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hmta byggberoendeinformation fr %s"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1098,7 +1116,7 @@ msgid ""
msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1107,32 +1125,32 @@ msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
"versioner av paketet %s uppfyller versionskraven"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden fr %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Moduler som stds:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1314,23 +1332,23 @@ msgstr "meddelande r viktiga. Frsk rtta dem och [I]nstallera igen"
msgid "Merging Available information"
msgstr "Lgger in tillgnglighetsinformation"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Misslyckades att skapa rr"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Misslyckades att kra gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Frdrvat arkiv"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Oknd TAR-huvudtyp %u, del %s"
@@ -1477,8 +1495,8 @@ msgstr "Katalogerna info och temp mste ligga p samma filsystem"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Lser paketlistor"
@@ -1558,31 +1576,31 @@ msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Fel vid tolkning av MD5. Offset %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 "Detta r inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Internt fel, kunde inta hitta delen %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 "Detta r inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
# chdir
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Kunde inte g till %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Internt fel, kunde inte hitta del"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Misslyckades att hitta en giltig control-fil"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Kunde inte tolka control-filen"
@@ -1678,7 +1696,7 @@ msgstr "Inget svar p frbindelsen inom tidsgrnsen"
msgid "Server closed the connection"
msgstr "Servern stngde frbindelsen"
-#: 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 "Lsfel"
@@ -1768,7 +1786,7 @@ msgstr "Dataverfring misslyckades, servern sade \"%s\""
msgid "Query"
msgstr "Frgar"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Kunde inte starta "
@@ -1916,6 +1934,14 @@ msgstr "Anslutning misslyckades"
msgid "Internal error"
msgstr "Internt fel"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Filen ej funnen"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Frbindelsen stngdes i frtid"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Kan inte utfra mmap p en tom fil"
@@ -2076,54 +2102,54 @@ msgstr "Anvnder inte lsning fr nfs-monterad lsfil %s"
msgid "Could not get lock %s"
msgstr "Kunde inte erhlla lset %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Vntade, p %s men den fanns inte dr"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Underprocessen %s rkade ut fr ett segmenteringsfel."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerade en felkod (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s avslutade ovntat"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Kunde inte ppna filen %s"
-#: 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 "lsning, har fortfarande %lu att lsa men inget r kvar"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Skrivfel"
-#: 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 "skrivning, har fortfarande %lu att skriva men kunde ej"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problem med att stnga filens"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problem med att lnka ut filen"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problem med att synka filen"
@@ -2211,76 +2237,66 @@ msgstr "Kandiderande versioner"
msgid "Dependency Generation"
msgstr "Beroendegenerering"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Kunde inte tolka paketfilen %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Rad %lu i kllistan %s har fel format (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Rad %lu i kllistan %s har fel format (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Rad %lu i kllistan %s har fel format (URI-tolkning)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Rad %lu i kllistan %s har fel format (Absolut dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Rad %lu i kllistan %s har fel format (dist-tolkning)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Leverantrsblock %s r ogiltigt"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "ppnar %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u fr lng i kllistan %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i kllistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen \"%s\" r oknd p rad %u i kllistan %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rad %u i kllistan %s har fel format (leverantrs-id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Oknt leverantrs-id \"%s\" p rad %u i kllistan %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2298,14 +2314,14 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Indexfiler av typ \"%s\" stds inte"
-#: 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 ""
"Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2313,7 +2329,7 @@ msgstr ""
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p "
"hllna paket."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hllt trasiga paket."
@@ -2352,7 +2368,7 @@ msgstr "Kunde inte avgra en lmpligt paketsystemstyp"
msgid "Unable to stat %s."
msgstr "Kunde inte ta status p %s."
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Du mste lgga till ngra \"source\"-URI:er i din sources.list"
@@ -2455,16 +2471,20 @@ msgstr "Kunde inte ta status p kllkodspaketlistan %s"
msgid "Collecting File Provides"
msgstr "Samlar filberoenden"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av kllcache"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5-kontrollsumma stmmer inte"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2473,7 +2493,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2482,27 +2502,116 @@ 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:419
+#: apt-pkg/acquire-item.cc:807
#, 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:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5-kontrollsumma stmmer inte"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Leverantrsblock %s r ogiltigt"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Filen ej funnen"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Frbindelsen stngdes i frtid"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Vntar p huvuden"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Lser paketlistor"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Rad %u fr lng i kllistan %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Oknt leverantrs-id \"%s\" p rad %u i kllistan %s"
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
diff --git a/po/tl.po b/po/tl.po
index c0c333d75..f224df384 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-20 19:00+0100\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-02-02 15:50+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -151,14 +151,14 @@ msgstr " Talaang Bersyon:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -296,7 +296,7 @@ msgstr ""
" -c=? Basahin ang tipunang pagkaayos na ito\n"
" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makasulat sa %s"
@@ -529,7 +529,12 @@ msgstr " %s ay walang override entry\n"
msgid " %s maintainer is %s not %s\n"
msgstr " Maintainer ng %s ay %s hindi %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Internal Error, hindi mahanap ang miyembrong %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Sawi ang pagreserba ng memory"
@@ -623,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:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -699,111 +704,124 @@ msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nai-upgrade, %lu bagong instol, "
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ininstol muli, "
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na tatanggalin at %lu na di inapgreyd.\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu na di lubos na na-instol o tinanggal.\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "Inaayos ang mga dependensiya..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " ay sawi."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "Hindi maayos ang mga dependensiya"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "Hindi mai-minimize ang upgrade set"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " Tapos"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito."
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Ang susunod na mga pakete ay ia-apgreyd:"
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "May mga problema at -y ay ginamit na walang --force-yes"
+
+#: cmdline/apt-get.cc:762
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:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "Di maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Matapos magbuklat ay %sB ng karagdagang lugar sa disk ay magagamit.\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Matapos magbuklat %sB ng lugar sa disk ay mapapalaya.\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Kulang kayo ng libreng lugar sa %s."
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "May mga problema at -y ay ginamit na walang --force-yes"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Oo, gawin ang sinasabi ko!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -814,28 +832,28 @@ msgstr ""
"Upang magpatuloy, ibigay ang pariralang '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Abort."
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "Nais niyo bang magpatuloy? [O/h] "
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sawi sa pagkuha ng %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "May mga tipunang hindi nakuha"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -843,48 +861,48 @@ msgstr ""
"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
"subukang may --fix-missing?"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Hindi maayos ang mga kulang na pakete."
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "Ina-abort ang pag-instol."
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Naka-instol]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Dapat ninyong piliin ang isa na instolahin."
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -895,49 +913,49 @@ msgstr ""
"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n"
"sa ibang pinagmulan.\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para sa '%s' ay hindi nahanap"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -945,26 +963,26 @@ msgstr ""
"May mga tipunang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
"mga luma na lamang."
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "Internal Error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
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:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -972,7 +990,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -983,7 +1001,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:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -993,106 +1011,106 @@ msgstr ""
"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
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:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "Kinakalkula ang upgrade... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Sawi"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
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:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, 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:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "Sawi sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, 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:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Sawi ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay sawi.\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "Sawi ang prosesong anak"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
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:2031
+#: cmdline/apt-get.cc:2084
#, 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:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1101,7 +1119,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1110,32 +1128,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:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, 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:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "Sawi sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1314,23 +1332,23 @@ msgstr ""
msgid "Merging Available information"
msgstr "Pinagsasama ang magagamit na impormasyon"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Sawi sa paglikha ng mga pipe"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Sawi sa pagtakbo ng gzip "
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Sirang arkibo"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "Sawi ang checksum ng tar, sira ang arkibo"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Di kilalang uri ng TAR header %u, miyembrong %s"
@@ -1475,8 +1493,8 @@ msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "Binabasa ang Listahan ng mga Pakete"
@@ -1556,30 +1574,30 @@ msgstr "Maling ConfFile section sa tipunang status. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Error sa pag-parse ng MD5. Offset %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 "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Internal Error, hindi mahanap ang miyembrong %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 "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Hindi makalipat sa %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "Internal Error, hindi mahanap ang miyembro"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Sawi sa paghanap ng tanggap na tipunang control"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "Di maintindihang tipunang control"
@@ -1675,7 +1693,7 @@ msgstr "Lumipas ang koneksyon"
msgid "Server closed the connection"
msgstr "Sinarhan ng server ang koneksyon"
-#: 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 "Error sa pagbasa"
@@ -1908,6 +1926,14 @@ msgstr "Sawi ang koneksyon"
msgid "Internal error"
msgstr "Internal na error"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Hindi Nahanap ang Tipunan"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Nagsara ng maaga ang koneksyon"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Hindi mai-mmap ang tipunang walang laman"
@@ -2072,54 +2098,54 @@ msgstr ""
msgid "Could not get lock %s"
msgstr "hindi makuha ang aldaba %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Naghudyat ang sub-process %s ng error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Hindi mabuksan ang tipunang %s"
-#: 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 "pagbasa, mayroong %lu na babasahin ngunit walang natira"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "Error sa pagsulat"
-#: 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 "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Problema sa pagsara ng tipunan"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Problema sa pag-unlink ng tipunan"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng tipunan"
@@ -2204,76 +2230,66 @@ msgstr "Bersyong Kandidato"
msgid "Dependency Generation"
msgstr "Pagbuo ng Dependensiya"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Hindi ma-parse ang tipunang pakete %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Hindi ma-parse ang tipunang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (Absolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Block ng nagbebenta %s ay di tanggap"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa tipunang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Di kilalang uri '%s' sa linyang %u sa tipunang pagkukunan %s"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (vendor id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "Di kilalang vendor ID '%s' sa linya %u ng tipunang pagkukunan %s"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2291,7 +2307,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Hindi suportado ang uri ng tipunang index na '%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."
@@ -2299,7 +2315,7 @@ msgstr ""
"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
"para dito."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2307,7 +2323,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
"ito ng mga paketeng naka-hold."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
@@ -2346,7 +2362,7 @@ msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
msgid "Unable to stat %s."
msgstr "Hindi ma-stat ang %s"
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
@@ -2451,16 +2467,20 @@ msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
msgid "Collecting File Provides"
msgstr "Kinukuha ang Tipunang Provides"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "Di tugmang MD5Sum"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2469,7 +2489,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:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2478,7 +2498,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:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2486,18 +2506,107 @@ msgstr ""
"Sira ang tipunang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "Di tugmang laki"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "Di tugmang MD5Sum"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Block ng nagbebenta %s ay di tanggap"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Hindi Nahanap ang Tipunan"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Nagsara ng maaga ang koneksyon"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Naghihintay ng mga header"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Binabasa ang Listahan ng mga Pakete"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Labis ang haba ng linyang %u sa tipunang pagkukunan %s."
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Di kilalang vendor ID '%s' sa linya %u ng tipunang pagkukunan %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 20e6f8a54..a5af14489 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: 2004-07-29 09:38-0700\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"
"PO-Revision-Date: 2005-01-15 00:39+0800\n"
"Last-Translator: Tchaikov <chaisave@263.net>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -146,14 +146,14 @@ msgstr " 版本列表："
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -288,7 +288,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -518,7 +518,12 @@ msgstr " %s 中没有 override 项\n"
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 无法再分配内存"
@@ -612,7 +617,7 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -688,110 +693,123 @@ msgstr ""
"注意：下列的重要软件包将被卸载 \n"
"请勿尝试，除非您确实清楚您正在执行的操作！"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "无法使升级的软件包集最小化"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "下列的软件包将被升级："
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "碰到了一些问题，您使用了 -y 选项但是没有用 --force-yes。"
+
+#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项但是没有用 --force-yes。"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -802,28 +820,28 @@ msgstr ""
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -831,47 +849,47 @@ msgstr ""
"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试？"
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意，我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -882,74 +900,74 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃，\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它："
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s，因为无法下载它。\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1295
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1319
+#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgstr "内部错误，AllUpgrade 造成某些故障"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1485
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1515
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1518
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -957,7 +975,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1530
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"
@@ -968,7 +986,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1538
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"
@@ -977,112 +995,112 @@ msgstr ""
"您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1543
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对问题的解决有所帮助："
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1546
msgid "Broken packages"
msgstr "受损安装包"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1572
msgid "The following extra packages will be installed:"
msgstr "将会安装下列的额外的软件包："
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1643
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1644
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1672
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1919
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1924
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1927
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1964
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2004
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2040
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2084
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2104
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2156
#, 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:2155
+#: cmdline/apt-get.cc:2208
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1091,30 +1109,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2243
#, 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:2215
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2286
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgstr "被支持模块："
-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2359
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1287,23 +1305,23 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
msgid "Merging Available information"
msgstr "正在合并现有信息"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgstr "tar 的校验码不符，包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u，成员 %s"
@@ -1448,8 +1466,8 @@ msgstr "info 和 temp 目录要求处于同一文件系统之下"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgstr "正在读取软件包列表"
@@ -1528,30 +1546,30 @@ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "无法解析 MD5 码。文件内偏移量为 %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 "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %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 "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "无法切换工作目录到 %s"
-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgstr "内部错误，无法定位包内文件"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "无法在打包文件中找到有效的主控文件"
-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgstr "不能解析的主控文件"
@@ -1646,7 +1664,7 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: 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 "读错误"
@@ -1735,7 +1753,7 @@ msgstr "数据传送出错，服务器响应道“%s”"
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -1879,6 +1897,14 @@ msgstr "连接失败"
msgid "Internal error"
msgstr "内部错误"
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "无法找到该文件"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "连接被永久关闭"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
@@ -2038,54 +2064,54 @@ msgstr "无法在 nfs 文件系统上使用文件锁 %s"
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出了"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: 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 "读文件时出错，还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "写文件出错"
-#: 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 "写文件时出错，还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "关闭文件时出错"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "用 unlink 删除文件时出错"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "同步文件时出错"
@@ -2170,78 +2196,66 @@ msgstr "候选版本"
msgid "Dependency Generation"
msgstr "生成依赖关系"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
msgid "Malformed line %lu in source list %s (Absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Vendor 块 %s 是无效的"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr ""
-"在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1"
-"$s”"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
@@ -2258,13 +2272,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%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 "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2272,7 +2286,7 @@ msgstr ""
"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
@@ -2312,7 +2326,7 @@ msgstr "无法确定适合的打包系统类型"
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL"
@@ -2412,16 +2426,20 @@ msgstr "无法获取源软件包列表 %s 的状态"
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr "MD5 校验和不符"
+
+#: apt-pkg/acquire-item.cc:718
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2430,7 +2448,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:771
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2438,24 +2456,115 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:807
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:894
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5 校验和不符"
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Vendor 块 %s 是无效的"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "无法找到该文件"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "连接被永久关闭"
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "正在等待报头"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
+#~ "1$s”"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3e488b77d..dc2d3c9b9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -147,7 +147,7 @@ msgstr " 版本表格:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 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
#, c-format
@@ -1667,7 +1667,7 @@ msgstr "連線逾時"
msgid "Server closed the connection"
msgstr "伺服器關閉聯線。"
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "讀取失敗。"
@@ -2067,54 +2067,54 @@ msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s"
msgid "Could not get lock %s"
msgstr "無法取得『%s』鎖。"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited, for %s but it wasn't there"
msgstr "等待 %s 但是它不存在"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子程序 %s 收到一個記憶體錯誤"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 回傳錯誤碼(%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期的結束"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "無法開啟『%s』檔案。"
-#: 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 "讀取，仍有 %lu 未讀"
-#: apt-pkg/contrib/fileutl.cc:491
+#: apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr "寫入失敗。"
-#: 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 "寫入，仍有 %lu 待寫入但無法寫入"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "程式關閉檔案"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "程式刪除檔案"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "程式同步檔案"
@@ -2466,6 +2466,99 @@ msgstr "檔案大小不符合。"
msgid "Vendor block %s contains no fingerprint"
msgstr "『%s』商家區段有錯誤。"
+#: apt-pkg/cdrom.cc:487
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:521
+#, c-format
+msgid "Stored Label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:559
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "等待標頭"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:571
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:589
+msgid "Scanning Disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:627
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:700
+#, fuzzy, c-format
+msgid ""
+"This Disc is called: \n"
+"'%s'\n"
+msgstr "這個碟片名為："
+
+#: apt-pkg/cdrom.cc:704
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "讀取套件清單中"
+
+#: apt-pkg/cdrom.cc:728
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "來源檔『%2$s』第 %1$u 行太長。"
+
+#: apt-pkg/cdrom.cc:737
+msgid "Source List entries for this Disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:771
+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 mismachted files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgstr ""
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "來源檔『%3$s』第 %2$u 行的『%1$s』商家名稱有錯誤。"
@@ -2480,9 +2573,6 @@ msgstr "『%s』商家區段有錯誤。"
#~ msgid "Please insert a Disc in the drive and press enter"
#~ msgstr "請把碟片插入碟機，然後按 [Enter] 鍵。"
-#~ msgid "This Disc is called:"
-#~ msgstr "這個碟片名為："
-
#~ msgid "Done. "
#~ msgstr "完成。"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 17:30:53 +0000