summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-inst/dirstream.cc16
-rw-r--r--apt-pkg/acquire-item.cc27
-rw-r--r--apt-pkg/acquire-item.h11
-rw-r--r--apt-pkg/acquire.cc6
-rw-r--r--apt-pkg/cacheiterators.h2
-rw-r--r--apt-pkg/contrib/configuration.cc26
-rw-r--r--apt-pkg/contrib/configuration.h28
-rw-r--r--apt-pkg/contrib/md5.h1
-rw-r--r--apt-pkg/contrib/mmap.h2
-rw-r--r--apt-pkg/contrib/progress.cc4
-rw-r--r--apt-pkg/contrib/progress.h4
-rw-r--r--apt-pkg/contrib/strutl.cc67
-rw-r--r--apt-pkg/contrib/strutl.h26
-rw-r--r--apt-pkg/deb/deblistparser.cc4
-rw-r--r--apt-pkg/init.h2
-rw-r--r--apt-pkg/makefile2
-rw-r--r--apt-pkg/packagemanager.cc4
-rw-r--r--apt-pkg/pkgcache.cc4
-rw-r--r--apt-pkg/pkgcache.h6
-rw-r--r--apt-pkg/pkgcachegen.cc16
-rw-r--r--apt-pkg/pkgcachegen.h17
-rw-r--r--configure.in2
-rw-r--r--debian/changelog23
-rw-r--r--doc/examples/configure-index1
-rw-r--r--methods/http.cc41
-rw-r--r--methods/http.h5
-rw-r--r--methods/makefile2
-rw-r--r--po/ChangeLog5
-rw-r--r--po/apt-all.pot185
-rw-r--r--po/bs.po185
-rw-r--r--po/ca.po187
-rw-r--r--po/cs.po187
-rw-r--r--po/da.po187
-rw-r--r--po/de.po187
-rw-r--r--po/el.po187
-rw-r--r--po/en_GB.po185
-rw-r--r--po/es.po187
-rw-r--r--po/eu.po187
-rw-r--r--po/fi.po187
-rw-r--r--po/fr.po187
-rw-r--r--po/he.po185
-rw-r--r--po/hu.po187
-rw-r--r--po/it.po187
-rw-r--r--po/ja.po187
-rw-r--r--po/ko.po187
-rw-r--r--po/nb.po187
-rw-r--r--po/nl.po187
-rw-r--r--po/nn.po187
-rw-r--r--po/pl.po187
-rw-r--r--po/pt.po187
-rw-r--r--po/pt_BR.po187
-rw-r--r--po/ro.po187
-rw-r--r--po/ru.po187
-rw-r--r--po/sk.po187
-rw-r--r--po/sl.po187
-rw-r--r--po/sv.po187
-rw-r--r--po/tl.po187
-rw-r--r--po/zh_CN.po202
-rw-r--r--po/zh_TW.po187
59 files changed, 3145 insertions, 3013 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 7ae93c9b0..898ede31b 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
case Item::CharDevice:
case Item::BlockDevice:
case Item::Directory:
+ {
+ struct stat Buf;
+ // check if the dir is already there, if so return true
+ if (stat(Itm.Name,&Buf) == 0)
+ {
+ if(S_ISDIR(Buf.st_mode))
+ return true;
+ // something else is there already, return false
+ return false;
+ }
+ // nothing here, create the dir
+ if(mkdir(Itm.Name,Itm.Mode) < 0)
+ return false;
+ return true;
+ break;
+ }
case Item::FIFO:
break;
}
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 343293386..09f25c0dd 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -183,7 +183,7 @@ string pkgAcqIndex::Custom600Headers()
void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
// no .bz2 found, retry with .gz
- if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") {
+ if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") {
Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz";
// retry with a gzip one
@@ -289,7 +289,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
else
Local = true;
- string compExt = Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1);
+ string compExt = Desc.URI.substr(Desc.URI.size()-3);
char *decompProg;
if(compExt == "bz2")
decompProg = "bzip2";
@@ -314,10 +314,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
const vector<IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI),
- MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc)
+ MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc),
+ MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets)
{
- this->MetaIndexParser = MetaIndexParser;
- this->IndexTargets = IndexTargets;
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
@@ -429,11 +428,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
string SigFile,
const vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
- Item(Owner), RealURI(URI), SigFile(SigFile)
+ Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
+ MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets)
{
- this->AuthPass = false;
- this->MetaIndexParser = MetaIndexParser;
- this->IndexTargets = IndexTargets;
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
@@ -1007,13 +1004,19 @@ void pkgAcqArchive::Finished()
// ---------------------------------------------------------------------
/* The file is added to the queue */
pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
- unsigned long Size,string Dsc,string ShortDesc) :
+ unsigned long Size,string Dsc,string ShortDesc,
+ const string &DestDir, const string &DestFilename) :
Item(Owner), Md5Hash(MD5)
{
Retries = _config->FindI("Acquire::Retries",0);
- DestFile = flNotDir(URI);
-
+ if(!DestFilename.empty())
+ DestFile = DestFilename;
+ else if(!DestDir.empty())
+ DestFile = DestDir + "/" + flNotDir(URI);
+ else
+ DestFile = flNotDir(URI);
+
// Create the item
Desc.URI = URI;
Desc.Description = Dsc;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index ea71153d5..9e7198d8d 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -223,9 +223,14 @@ class pkgAcqFile : public pkgAcquire::Item
pkgAcquire::MethodConfig *Cnf);
virtual string MD5Sum() {return Md5Hash;};
virtual string DescURI() {return Desc.URI;};
-
- pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size,
- string Desc,string ShortDesc);
+
+ // If DestFilename is empty, download to DestDir/<basename> if
+ // DestDir is non-empty, $CWD/<basename> otherwise. If
+ // DestFilename is NOT empty, DestDir is ignored and DestFilename
+ // is the absolute name to which the file should be downloaded.
+ pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size,
+ string Desc, string ShortDesc,
+ const string &DestDir="", const string &DestFilename="");
};
#endif
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 62209e65b..57cf60bfe 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -266,7 +266,11 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access)
Worker Work(Conf);
if (Work.Start() == false)
return 0;
-
+
+ /* if a method uses DownloadLimit, we switch to SingleInstance mode */
+ if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0)
+ Conf->SingleInstance = true;
+
return Conf;
}
/*}}}*/
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 62d2695dd..7c6f43351 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -107,7 +107,7 @@ class pkgCache::VerIterator
// Iteration
void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;};
inline void operator ++() {operator ++(0);};
- inline bool end() const {return Ver == Owner->VerP?true:false;};
+ inline bool end() const {return Owner == NULL || (Ver == Owner->VerP?true:false);};
inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;};
// Comparison
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 09e454be9..14a000fa5 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -110,7 +110,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S,
return 0;
I = new Item;
- I->Tag = string(S,Len);
+ I->Tag.assign(S,Len);
I->Next = *Last;
I->Parent = Head;
*Last = I;
@@ -161,7 +161,7 @@ string Configuration::Find(const char *Name,const char *Default) const
if (Itm == 0 || Itm->Value.empty() == true)
{
if (Default == 0)
- return string();
+ return "";
else
return Default;
}
@@ -180,7 +180,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const
if (Itm == 0 || Itm->Value.empty() == true)
{
if (Default == 0)
- return string();
+ return "";
else
return Default;
}
@@ -294,7 +294,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const
// Configuration::CndSet - Conditinal Set a value /*{{{*/
// ---------------------------------------------------------------------
/* This will not overwrite */
-void Configuration::CndSet(const char *Name,string Value)
+void Configuration::CndSet(const char *Name,const string &Value)
{
Item *Itm = Lookup(Name,true);
if (Itm == 0)
@@ -306,7 +306,7 @@ void Configuration::CndSet(const char *Name,string Value)
// Configuration::Set - Set a value /*{{{*/
// ---------------------------------------------------------------------
/* */
-void Configuration::Set(const char *Name,string Value)
+void Configuration::Set(const char *Name,const string &Value)
{
Item *Itm = Lookup(Name,true);
if (Itm == 0)
@@ -330,7 +330,7 @@ void Configuration::Set(const char *Name,int Value)
// Configuration::Clear - Clear an single value from a list /*{{{*/
// ---------------------------------------------------------------------
/* */
-void Configuration::Clear(string Name, int Value)
+void Configuration::Clear(const string Name, int Value)
{
char S[300];
snprintf(S,sizeof(S),"%i",Value);
@@ -340,7 +340,7 @@ void Configuration::Clear(string Name, int Value)
// Configuration::Clear - Clear an single value from a list /*{{{*/
// ---------------------------------------------------------------------
/* */
-void Configuration::Clear(string Name, string Value)
+void Configuration::Clear(const string Name, string Value)
{
Item *Top = Lookup(Name.c_str(),false);
if (Top == 0 || Top->Child == 0)
@@ -377,7 +377,7 @@ void Configuration::Clear(string Name)
if (Top == 0)
return;
- Top->Value = string();
+ Top->Value.clear();
Item *Stop = Top;
Top = Top->Child;
Stop->Child = 0;
@@ -485,7 +485,7 @@ string Configuration::Item::FullTag(const Item *Stop) const
sections like 'zone "foo.org" { .. };' This causes each section to be
added in with a tag like "zone::foo.org" instead of being split
tag/value. AsSectional enables Sectional parsing.*/
-bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
+bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
unsigned Depth)
{
// Open the stream for reading
@@ -711,13 +711,13 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
}
// Empty the buffer
- LineBuffer = string();
+ LineBuffer.clear();
// Move up a tag, but only if there is no bit to parse
if (TermChar == '}')
{
if (StackPos == 0)
- ParentTag = string();
+ ParentTag.clear();
else
ParentTag = Stack[--StackPos];
}
@@ -742,8 +742,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
// ReadConfigDir - Read a directory of config files /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional,
- unsigned Depth)
+bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional,
+ unsigned Depth)
{
DIR *D = opendir(Dir.c_str());
if (D == 0)
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 789bc82cf..0d4078dab 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -69,30 +69,30 @@ class Configuration
public:
string Find(const char *Name,const char *Default = 0) const;
- string Find(string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
+ string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
string FindFile(const char *Name,const char *Default = 0) const;
string FindDir(const char *Name,const char *Default = 0) const;
int FindI(const char *Name,int Default = 0) const;
- int FindI(string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
+ int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
bool FindB(const char *Name,bool Default = false) const;
- bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
+ bool FindB(const string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
string FindAny(const char *Name,const char *Default = 0) const;
- inline void Set(string Name,string Value) {Set(Name.c_str(),Value);};
- void CndSet(const char *Name,string Value);
- void Set(const char *Name,string Value);
+ inline void Set(const string Name,string Value) {Set(Name.c_str(),Value);};
+ void CndSet(const char *Name,const string &Value);
+ void Set(const char *Name,const string &Value);
void Set(const char *Name,int Value);
- inline bool Exists(string Name) const {return Exists(Name.c_str());};
+ inline bool Exists(const string Name) const {return Exists(Name.c_str());};
bool Exists(const char *Name) const;
bool ExistsAny(const char *Name) const;
// clear a whole tree
- void Clear(string Name);
+ void Clear(const string Name);
// remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
- void Clear(string List, string Value);
- void Clear(string List, int Value);
+ void Clear(const string List, string Value);
+ void Clear(const string List, int Value);
inline const Item *Tree(const char *Name) const {return Lookup(Name);};
@@ -106,10 +106,12 @@ class Configuration
extern Configuration *_config;
-bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional = false,
+bool ReadConfigFile(Configuration &Conf,const string &FName,
+ bool AsSectional = false,
unsigned Depth = 0);
-bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional = false,
- unsigned Depth = 0);
+bool ReadConfigDir(Configuration &Conf,const string &Dir,
+ bool AsSectional = false,
+ unsigned Depth = 0);
#endif
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9447e9956..e280d714e 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -29,6 +29,7 @@
#include <string>
#include <algorithm>
+#include <stdint.h>
using std::string;
using std::min;
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index caffa0f90..e329b167a 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -94,7 +94,7 @@ class DynamicMMap : public MMap
unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0);
unsigned long Allocate(unsigned long ItemSize);
unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);
- inline unsigned long WriteString(string S) {return WriteString(S.c_str(),S.length());};
+ inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024);
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 8eb36fc20..cb272e389 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -50,7 +50,7 @@ void OpProgress::Progress(unsigned long Cur)
// ---------------------------------------------------------------------
/* */
void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
- unsigned long Size,string Op)
+ unsigned long Size,const string &Op)
{
this->Current = Current;
this->Total = Total;
@@ -67,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
// OpProgress::SubProgress - Set the sub progress state /*{{{*/
// ---------------------------------------------------------------------
/* */
-void OpProgress::SubProgress(unsigned long SubTotal,string Op)
+void OpProgress::SubProgress(unsigned long SubTotal,const string &Op)
{
this->SubTotal = SubTotal;
SubOp = Op;
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index d0b1f5f94..20caf4cdf 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -59,9 +59,9 @@ class OpProgress
void Progress(unsigned long Current);
void SubProgress(unsigned long SubTotal);
- void SubProgress(unsigned long SubTotal,string Op);
+ void SubProgress(unsigned long SubTotal,const string &Op);
void OverallProgress(unsigned long Current,unsigned long Total,
- unsigned long Size,string Op);
+ unsigned long Size,const string &Op);
virtual void Done() {};
OpProgress();
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index a75fbdf92..d96155917 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -199,10 +199,10 @@ bool ParseCWord(const char *&String,string &Res)
// QuoteString - Convert a string into quoted from /*{{{*/
// ---------------------------------------------------------------------
/* */
-string QuoteString(string Str,const char *Bad)
+string QuoteString(const string &Str, const char *Bad)
{
string Res;
- for (string::iterator I = Str.begin(); I != Str.end(); I++)
+ for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
{
if (strchr(Bad,*I) != 0 || isprint(*I) == 0 ||
*I <= 0x20 || *I >= 0x7F)
@@ -220,7 +220,7 @@ string QuoteString(string Str,const char *Bad)
// DeQuoteString - Convert a string from quoted from /*{{{*/
// ---------------------------------------------------------------------
/* This undoes QuoteString */
-string DeQuoteString(string Str)
+string DeQuoteString(const string &Str)
{
string Res;
for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
@@ -317,7 +317,7 @@ string TimeToStr(unsigned long Sec)
// SubstVar - Substitute a string for another string /*{{{*/
// ---------------------------------------------------------------------
/* This replaces all occurances of Subst with Contents in Str. */
-string SubstVar(string Str,string Subst,string Contents)
+string SubstVar(const string &Str,const string &Subst,const string &Contents)
{
string::size_type Pos = 0;
string::size_type OldPos = 0;
@@ -348,21 +348,18 @@ string SubstVar(string Str,const struct SubstVar *Vars)
/* This converts a URI into a safe filename. It quotes all unsafe characters
and converts / to _ and removes the scheme identifier. The resulting
file name should be unique and never occur again for a different file */
-string URItoFileName(string URI)
+string URItoFileName(const string &URI)
{
// Nuke 'sensitive' items
::URI U(URI);
- U.User = string();
- U.Password = string();
- U.Access = "";
+ U.User.clear();
+ U.Password.clear();
+ U.Access.clear();
// "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
- URI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
- string::iterator J = URI.begin();
- for (; J != URI.end(); J++)
- if (*J == '/')
- *J = '_';
- return URI;
+ string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
+ replace(NewURI.begin(),NewURI.end(),'/','_');
+ return NewURI;
}
/*}}}*/
// Base64Encode - Base64 Encoding routine for short strings /*{{{*/
@@ -371,7 +368,7 @@ string URItoFileName(string URI)
from wget and then patched and bug fixed.
This spec can be found in rfc2045 */
-string Base64Encode(string S)
+string Base64Encode(const string &S)
{
// Conversion table.
static char tbl[64] = {'A','B','C','D','E','F','G','H',
@@ -540,17 +537,17 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
// ---------------------------------------------------------------------
/* The format is like those used in package files and the method
communication system */
-string LookupTag(string Message,const char *Tag,const char *Default)
+string LookupTag(const string &Message,const char *Tag,const char *Default)
{
// Look for a matching tag.
int Length = strlen(Tag);
- for (string::iterator I = Message.begin(); I + Length < Message.end(); I++)
+ for (string::const_iterator I = Message.begin(); I + Length < Message.end(); I++)
{
// Found the tag
if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0)
{
// Find the end of line and strip the leading/trailing spaces
- string::iterator J;
+ string::const_iterator J;
I += Length + 1;
for (; isspace(*I) != 0 && I < Message.end(); I++);
for (J = I; *J != '\n' && J < Message.end(); J++);
@@ -572,7 +569,7 @@ string LookupTag(string Message,const char *Tag,const char *Default)
// ---------------------------------------------------------------------
/* This inspects the string to see if it is true or if it is false and
then returns the result. Several varients on true/false are checked. */
-int StringToBool(string Text,int Default)
+int StringToBool(const string &Text,int Default)
{
char *End;
int Res = strtol(Text.c_str(),&End,0);
@@ -738,7 +735,7 @@ static time_t timegm(struct tm *t)
'timegm' to convert a struct tm in UTC to a time_t. For some bizzar
reason the C library does not provide any such function :< This also
handles the weird, but unambiguous FTP time format*/
-bool StrToTime(string Val,time_t &Result)
+bool StrToTime(const string &Val,time_t &Result)
{
struct tm Tm;
char Month[10];
@@ -825,7 +822,7 @@ static int HexDigit(int c)
// Hex2Num - Convert a long hex number into a buffer /*{{{*/
// ---------------------------------------------------------------------
/* The length of the buffer must be exactly 1/2 the length of the string. */
-bool Hex2Num(string Str,unsigned char *Num,unsigned int Length)
+bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length)
{
if (Str.length() != Length*2)
return false;
@@ -986,7 +983,7 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...)
// ---------------------------------------------------------------------
/* The domain list is a comma seperate list of domains that are suffix
matched against the argument */
-bool CheckDomainList(string Host,string List)
+bool CheckDomainList(const string &Host,const string &List)
{
string::const_iterator Start = List.begin();
for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++)
@@ -1009,7 +1006,7 @@ bool CheckDomainList(string Host,string List)
// URI::CopyFrom - Copy from an object /*{{{*/
// ---------------------------------------------------------------------
/* This parses the URI into all of its components */
-void URI::CopyFrom(string U)
+void URI::CopyFrom(const string &U)
{
string::const_iterator I = U.begin();
@@ -1038,9 +1035,9 @@ void URI::CopyFrom(string U)
SingleSlash = U.end();
// We can now write the access and path specifiers
- Access = string(U,0,FirstColon - U.begin());
+ Access.assign(U.begin(),FirstColon);
if (SingleSlash != U.end())
- Path = string(U,SingleSlash - U.begin());
+ Path.assign(SingleSlash,U.end());
if (Path.empty() == true)
Path = "/";
@@ -1070,14 +1067,14 @@ void URI::CopyFrom(string U)
if (At == SingleSlash)
{
if (FirstColon < SingleSlash)
- Host = string(U,FirstColon - U.begin(),SingleSlash - FirstColon);
+ Host.assign(FirstColon,SingleSlash);
}
else
{
- Host = string(U,At - U.begin() + 1,SingleSlash - At - 1);
- User = string(U,FirstColon - U.begin(),SecondColon - FirstColon);
+ Host.assign(At+1,SingleSlash);
+ User.assign(FirstColon,SecondColon);
if (SecondColon < At)
- Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1);
+ Password.assign(SecondColon+1,At);
}
// Now we parse the RFC 2732 [] hostnames.
@@ -1105,7 +1102,7 @@ void URI::CopyFrom(string U)
// Tsk, weird.
if (InBracket == true)
{
- Host = string();
+ Host.clear();
return;
}
@@ -1116,7 +1113,7 @@ void URI::CopyFrom(string U)
return;
Port = atoi(string(Host,Pos+1).c_str());
- Host = string(Host,0,Pos);
+ Host.assign(Host,0,Pos);
}
/*}}}*/
// URI::operator string - Convert the URI to a string /*{{{*/
@@ -1171,12 +1168,12 @@ URI::operator string()
// URI::SiteOnly - Return the schema and site for the URI /*{{{*/
// ---------------------------------------------------------------------
/* */
-string URI::SiteOnly(string URI)
+string URI::SiteOnly(const string &URI)
{
::URI U(URI);
- U.User = string();
- U.Password = string();
- U.Path = string();
+ U.User.clear();
+ U.Password.clear();
+ U.Path.clear();
U.Port = 0;
return U;
}
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 353e78ac9..6ec2b7811 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -43,24 +43,24 @@ char *_strstrip(char *String);
char *_strtabexpand(char *String,size_t Len);
bool ParseQuoteWord(const char *&String,string &Res);
bool ParseCWord(const char *&String,string &Res);
-string QuoteString(string Str,const char *Bad);
-string DeQuoteString(string Str);
+string QuoteString(const string &Str,const char *Bad);
+string DeQuoteString(const string &Str);
string SizeToStr(double Bytes);
string TimeToStr(unsigned long Sec);
-string Base64Encode(string Str);
-string URItoFileName(string URI);
+string Base64Encode(const string &Str);
+string URItoFileName(const string &URI);
string TimeRFC1123(time_t Date);
-bool StrToTime(string Val,time_t &Result);
-string LookupTag(string Message,const char *Tag,const char *Default = 0);
-int StringToBool(string Text,int Default = -1);
+bool StrToTime(const string &Val,time_t &Result);
+string LookupTag(const string &Message,const char *Tag,const char *Default = 0);
+int StringToBool(const string &Text,int Default = -1);
bool ReadMessages(int Fd, vector<string> &List);
bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0);
-bool Hex2Num(string Str,unsigned char *Num,unsigned int Length);
+bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length);
bool TokSplitString(char Tok,char *Input,char **List,
unsigned long ListMax);
void ioprintf(ostream &out,const char *format,...) APT_FORMAT2;
char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3;
-bool CheckDomainList(string Host,string List);
+bool CheckDomainList(const string &Host, const string &List);
#define APT_MKSTRCMP(name,func) \
inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
@@ -101,7 +101,7 @@ inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
class URI
{
- void CopyFrom(string From);
+ void CopyFrom(const string &From);
public:
@@ -113,9 +113,9 @@ class URI
unsigned int Port;
operator string();
- inline void operator =(string From) {CopyFrom(From);};
+ inline void operator =(const string &From) {CopyFrom(From);};
inline bool empty() {return Access.empty();};
- static string SiteOnly(string URI);
+ static string SiteOnly(const string &URI);
URI(string Path) {CopyFrom(Path);};
URI() : Port(0) {};
@@ -127,7 +127,7 @@ struct SubstVar
const string *Contents;
};
string SubstVar(string Str,const struct SubstVar *Vars);
-string SubstVar(string Str,string Subst,string Contents);
+string SubstVar(const string &Str,const string &Subst,const string &Contents);
struct RxChoiceList
{
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 25b533773..b11d2531c 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -377,12 +377,12 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
const char *End = I;
for (; End > Start && isspace(End[-1]); End--);
- Ver = string(Start,End-Start);
+ Ver.assign(Start,End-Start);
I++;
}
else
{
- Ver = string();
+ Ver.clear();
Op = pkgCache::Dep::NoOp;
}
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index e21351797..8255b406a 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -18,7 +18,7 @@
// See the makefile
#define APT_PKG_MAJOR 3
-#define APT_PKG_MINOR 10
+#define APT_PKG_MINOR 11
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 8de7d945e..0e6aecc65 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.10
+MAJOR=3.11
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
APT_DOMAIN:=libapt-pkg$(MAJOR)
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 155408bb4..4b3dd8be2 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -593,7 +593,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
(Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
{
- _error->Error("Internal Error, trying to manipulate a kept package");
+ _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name());
return Failed;
}
@@ -634,6 +634,8 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)
{
OrderResult Res = OrderInstall();
+ if(Debug)
+ std::clog << "OrderInstall() returned: " << Res << std::endl;
if (Res != Failed)
if (Go(status_fd) == false)
return Failed;
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 6ef7cafb0..9926befe9 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -153,7 +153,7 @@ bool pkgCache::ReMap()
/* This is used to generate the hash entries for the HashTable. With my
package list from bo this function gets 94% table usage on a 512 item
table (480 used items) */
-unsigned long pkgCache::sHash(string Str) const
+unsigned long pkgCache::sHash(const string &Str) const
{
unsigned long Hash = 0;
for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
@@ -173,7 +173,7 @@ unsigned long pkgCache::sHash(const char *Str) const
// Cache::FindPkg - Locate a package by name /*{{{*/
// ---------------------------------------------------------------------
/* Returns 0 on error, pointer to the package otherwise */
-pkgCache::PkgIterator pkgCache::FindPkg(string Name)
+pkgCache::PkgIterator pkgCache::FindPkg(const string &Name)
{
// Look at the hash bucket
Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)];
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index b07951dfb..587d97534 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -89,7 +89,7 @@ class pkgCache
string CacheFile;
MMap &Map;
- unsigned long sHash(string S) const;
+ unsigned long sHash(const string &S) const;
unsigned long sHash(const char *S) const;
public:
@@ -111,14 +111,14 @@ class pkgCache
inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
// String hashing function (512 range)
- inline unsigned long Hash(string S) const {return sHash(S);};
+ inline unsigned long Hash(const string &S) const {return sHash(S);};
inline unsigned long Hash(const char *S) const {return sHash(S);};
// Usefull transformation things
const char *Priority(unsigned char Priority);
// Accessors
- PkgIterator FindPkg(string Name);
+ PkgIterator FindPkg(const string &Name);
Header &Head() {return *HeaderP;};
inline PkgIterator PkgBegin();
inline PkgIterator PkgEnd();
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 2340f97fd..de854bee5 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -266,7 +266,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
// CacheGenerator::NewPackage - Add a new package /*{{{*/
// ---------------------------------------------------------------------
/* This creates a new package structure and adds it to the hash table */
-bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name)
+bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name)
{
Pkg = Cache.FindPkg(Name);
if (Pkg.end() == false)
@@ -330,7 +330,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
// ---------------------------------------------------------------------
/* This puts a version structure in the linked list */
unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
- string VerStr,
+ const string &VerStr,
unsigned long Next)
{
// Get a structure
@@ -354,8 +354,8 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
/* This creates a dependency element in the tree. It is linked to the
version and to the package that it is pointing to. */
bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
- string PackageName,
- string Version,
+ const string &PackageName,
+ const string &Version,
unsigned int Op,
unsigned int Type)
{
@@ -419,8 +419,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
// ---------------------------------------------------------------------
/* */
bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
- string PackageName,
- string Version)
+ const string &PackageName,
+ const string &Version)
{
pkgCache &Cache = Owner->Cache;
@@ -459,7 +459,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
// ---------------------------------------------------------------------
/* This is used to select which file is to be associated with all newly
added versions. The caller is responsible for setting the IMS fields. */
-bool pkgCacheGenerator::SelectFile(string File,string Site,
+bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,
const pkgIndexFile &Index,
unsigned long Flags)
{
@@ -543,7 +543,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
/* This just verifies that each file in the list of index files exists,
has matching attributes with the cache and the cache does not have
any extra files. */
-static bool CheckValidity(string CacheFile, FileIterator Start,
+static bool CheckValidity(const string &CacheFile, FileIterator Start,
FileIterator End,MMap **OutMap = 0)
{
// No file, certainly invalid
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 7d0920629..9a729eea4 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -53,17 +53,17 @@ class pkgCacheGenerator
// Flag file dependencies
bool FoundFileDeps;
- bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
+ bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
- unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next);
+ unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
public:
unsigned long WriteUniqString(const char *S,unsigned int Size);
- inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
+ inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());};
void DropProgress() {Progress = 0;};
- bool SelectFile(string File,string Site,pkgIndexFile const &Index,
+ bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index,
unsigned long Flags = 0);
bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
inline pkgCache &GetCache() {return Cache;};
@@ -94,12 +94,13 @@ class pkgCacheGenerator::ListParser
inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
- inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
+ inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);};
inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
- bool NewDepends(pkgCache::VerIterator Ver,string Package,
- string Version,unsigned int Op,
+ bool NewDepends(pkgCache::VerIterator Ver,const string &Package,
+ const string &Version,unsigned int Op,
unsigned int Type);
- bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
+ bool NewProvides(pkgCache::VerIterator Ver,const string &Package,
+ const string &Version);
public:
diff --git a/configure.in b/configure.in
index fb6441f58..8b2a301e0 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.42.3ubuntu2")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43ubuntu1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 8f03f2dc7..16fdd1596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
+apt (0.6.43) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
+ * zh_CN.po: Completed to 510 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+ * make pkgDirStream (a bit) more complete
+ * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows)
+ (closes: #339533)
+ * pkgAcqFile is more flexible now (closes: #57091)
+ * support a download rate limit for http (closes: #146877)
+ * included lots of the speedup changes from #319377
+ * add stdint.h to contrib/md5.h (closes: #340448)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:22:31 +0100
+
apt (0.6.42.3ubuntu2) dapper; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index a93b74349..9e851d753 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -117,6 +117,7 @@ Acquire
No-Cache "false";
Max-Age "86400"; // 1 Day age on index files
No-Store "false"; // Prevent the cache from storing archives
+ Dl-Limit "7"; // 7Kb/sec maximum download rate
};
ftp
diff --git a/methods/http.cc b/methods/http.cc
index ba86aa6b6..a5c9601e7 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -58,6 +58,12 @@ unsigned long PipelineDepth = 10;
unsigned long TimeOut = 120;
bool Debug = false;
+
+unsigned long CircleBuf::BwReadLimit=0;
+unsigned long CircleBuf::BwTickReadData=0;
+struct timeval CircleBuf::BwReadTick={0,0};
+const unsigned int CircleBuf::BW_HZ=10;
+
// CircleBuf::CircleBuf - Circular input buffer /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -65,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
{
Buf = new unsigned char[Size];
Reset();
+
+ CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
}
/*}}}*/
// CircleBuf::Reset - Reset to the default state /*{{{*/
@@ -90,16 +98,45 @@ void CircleBuf::Reset()
is non-blocking.. */
bool CircleBuf::Read(int Fd)
{
+ unsigned long BwReadMax;
+
while (1)
{
// Woops, buffer is full
if (InP - OutP == Size)
return true;
-
+
+ // what's left to read in this tick
+ BwReadMax = CircleBuf::BwReadLimit/BW_HZ;
+
+ if(CircleBuf::BwReadLimit) {
+ struct timeval now;
+ gettimeofday(&now,0);
+
+ unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+ now.tv_usec-CircleBuf::BwReadTick.tv_usec;
+ if(d > 1000000/BW_HZ) {
+ CircleBuf::BwReadTick = now;
+ CircleBuf::BwTickReadData = 0;
+ }
+
+ if(CircleBuf::BwTickReadData >= BwReadMax) {
+ usleep(1000000/BW_HZ);
+ return true;
+ }
+ }
+
// Write the buffer segment
int Res;
- Res = read(Fd,Buf + (InP%Size),LeftRead());
+ if(CircleBuf::BwReadLimit) {
+ Res = read(Fd,Buf + (InP%Size),
+ BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
+ } else
+ Res = read(Fd,Buf + (InP%Size),LeftRead());
+ if(Res > 0 && BwReadLimit > 0)
+ CircleBuf::BwTickReadData += Res;
+
if (Res == 0)
return false;
if (Res < 0)
diff --git a/methods/http.h b/methods/http.h
index c5a4d0e86..541e2952c 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -31,6 +31,11 @@ class CircleBuf
unsigned long MaxGet;
struct timeval Start;
+ static unsigned long BwReadLimit;
+ static unsigned long BwTickReadData;
+ static struct timeval BwReadTick;
+ static const unsigned int BW_HZ;
+
unsigned long LeftRead()
{
unsigned long Sz = Size - (InP - OutP);
diff --git a/methods/makefile b/methods/makefile
index 06fd2a6fc..1e3b1ef85 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
BIN := $(BIN)/methods
# FIXME..
-LIB_APT_PKG_MAJOR = 3.10
+LIB_APT_PKG_MAJOR = 3.11
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
diff --git a/po/ChangeLog b/po/ChangeLog
index 52086113d..830f746eb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14 Kov Tchai <tchaikov@sjtu.edu.cn>
+
+ * zh_CN.po: Completed to 510 strings
+ Definitely Closes: #338267
+
2005-11-13 Kov Tchai <tchaikov@sjtu.edu.cn>
* zh_CN.po: Completed to 507 strings
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 7ed987c02..f474c6a41 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,7 +148,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -535,7 +535,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -694,11 +694,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -727,7 +727,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -761,7 +761,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -770,7 +770,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr ""
@@ -862,45 +862,45 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -908,158 +908,158 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, 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:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1260,7 +1260,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr ""
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1313,7 +1313,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1608,7 +1609,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1738,76 +1739,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr ""
@@ -1820,7 +1821,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1941,7 +1942,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2108,52 +2109,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2197,7 +2198,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2217,12 +2218,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2340,31 +2341,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, 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:775
+#: apt-pkg/acquire-item.cc:778
#, 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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index e79db9027..b928190a8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+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"
@@ -147,7 +147,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -547,7 +547,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -708,11 +708,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -741,7 +741,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -776,7 +776,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -785,7 +785,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr ""
@@ -877,45 +877,45 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -923,158 +923,158 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, 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:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1275,7 +1275,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1328,7 +1328,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
@@ -1626,7 +1627,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1757,76 +1758,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1839,7 +1840,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1960,7 +1961,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2128,52 +2129,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2217,7 +2218,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2237,12 +2238,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2360,31 +2361,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, 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:775
+#: apt-pkg/acquire-item.cc:778
#, 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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index a49bc03f9..bd1f47988 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-07-19 01:31+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -638,7 +638,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -801,11 +801,11 @@ msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: 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."
@@ -835,7 +835,7 @@ msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -872,7 +872,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -881,7 +881,7 @@ msgstr "No s'ha pogut obtenir %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
@@ -980,15 +980,15 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -996,25 +996,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:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1022,7 +1022,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1034,7 +1034,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1044,119 +1044,119 @@ 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:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, 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:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1165,7 +1165,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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1174,32 +1174,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:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1457,7 +1457,7 @@ msgstr "Fitxer de conf. duplicat %s/%s"
msgid "Failed to write file %s"
msgstr "No s'ha pogut escriure el fitxer %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Ha fallat el tancament del fitxer %s"
@@ -1510,7 +1510,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -1816,7 +1817,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1952,76 +1953,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
msgid "Read error from %s process"
msgstr "Error llegint des del procés %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor http té el suport d'abast trencat"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Error intern"
@@ -2034,7 +2035,7 @@ msgstr "No es pot transferir un fitxer buit a memòria"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -2155,7 +2156,7 @@ msgstr "Operació no vàlida %s"
msgid "Unable to stat the mount point %s"
msgstr "No es pot obtenir informació del punt de muntatge %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "No es pot canviar a %s"
@@ -2322,52 +2323,52 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, 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:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, 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)"
@@ -2420,7 +2421,7 @@ msgstr "Falta el directori de llistes %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta el directori d'arxiu %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2443,12 +2444,12 @@ msgstr ""
" '%s'\n"
"en la unitat de '%s' i premeu Intro\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetament '%s' no està suportat."
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2572,11 +2573,11 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2586,7 +2587,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2595,7 +2596,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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2603,7 +2604,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Mida diferent"
diff --git a/po/cs.po b/po/cs.po
index 0b590f885..d7ccea80c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-11 16:14+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <provoz@debian.cz>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -633,7 +633,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -796,11 +796,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba při přidávání diverze"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
@@ -829,7 +829,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
@@ -866,7 +866,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -875,7 +875,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -972,15 +972,15 @@ msgstr "Verze '%s' pro '%s' nebyla nalezena"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -988,25 +988,25 @@ msgstr ""
"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
"použity starší verze."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1014,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1025,7 +1025,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1035,124 +1035,124 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Následujcící extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci..."
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, 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:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Stažení některých archívů selhalo."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, 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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,31 +1161,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, 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:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1436,7 +1436,7 @@ msgstr "Duplicitní konfigurační soubor %s/%s"
msgid "Failed to write file %s"
msgstr "Selhal zápis do souboru %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Selhalo zavření souboru %s"
@@ -1489,7 +1489,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Soubor %s/%s přepisuje ten z balíku %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nemohu číst %s"
@@ -1792,7 +1793,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1924,76 +1925,76 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba čtení z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2006,7 +2007,7 @@ msgstr "Nemohu provést mmap prázdného souboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2128,7 +2129,7 @@ msgstr "Neplatná operace %s"
msgid "Unable to stat the mount point %s"
msgstr "Nelze vyhodnotit přípojný bod %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nemohu přejít do %s"
@@ -2295,52 +2296,52 @@ msgstr "Nelze zpracovat soubor %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, 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:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
@@ -2389,7 +2390,7 @@ msgstr "Adresář seznamů %spartial chybí."
msgid "Archive directory %spartial is missing."
msgstr "Archivní adresář %spartial chybí."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2412,12 +2413,12 @@ msgstr ""
" '%s'\n"
"do mechaniky '%s' a stiskněte enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém '%s' není podporován"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
@@ -2538,11 +2539,11 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2551,7 +2552,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2560,14 +2561,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, 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:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
diff --git a/po/da.po b/po/da.po
index 3d5a009ff..54fbdc88b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-11-07 15:28+0100\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -635,7 +635,7 @@ msgstr "Kunne ikke omdbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
@@ -796,11 +796,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
@@ -829,7 +829,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -866,7 +866,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -875,7 +875,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -974,15 +974,15 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet"
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -990,25 +990,25 @@ msgstr ""
"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
"bruges i stedet."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1016,7 +1016,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1027,7 +1027,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1036,114 +1036,114 @@ 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:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1151,7 +1151,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1160,32 +1160,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1442,7 +1442,7 @@ msgstr "Dobbelt opstningsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Kunne ikke skrive filen %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Kunne ikke lukke filen %s"
@@ -1495,7 +1495,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overskriver filen i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke lse %s"
@@ -1798,7 +1799,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1931,77 +1932,77 @@ msgstr "Kunne ikke bne datarr for %s"
msgid "Read error from %s process"
msgstr "Lsefejl fra %s-process"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fandt en enkelt linje i hovedet p over %u tegn"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Intern fejl"
@@ -2014,7 +2015,7 @@ msgstr "Kan ikke udfre mmap for en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udfre mmap for %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2135,7 +2136,7 @@ msgstr "Ugyldig handling %s"
msgid "Unable to stat the mount point %s"
msgstr "Kunne ikke finde monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kunne ikke skifte til %s"
@@ -2302,52 +2303,52 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "bner %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
@@ -2399,7 +2400,7 @@ msgstr "Listemappen %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Henter fil %li ud af %li (%s tilbage)"
@@ -2419,12 +2420,12 @@ msgstr "Metoden %s startede ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understttes ikke"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2544,11 +2545,11 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2557,7 +2558,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2566,13 +2567,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
diff --git a/po/de.po b/po/de.po
index 23f79dfe3..a28e3d9ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-06-15 18:22+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -646,7 +646,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -810,11 +810,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -845,7 +845,7 @@ msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
@@ -882,7 +882,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
@@ -891,7 +891,7 @@ msgstr "Konnte %s nicht holen %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
@@ -991,15 +991,15 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« nimmt keine Argumente"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1007,27 +1007,27 @@ msgstr ""
"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
"ignoriert oder alte an ihrer Stelle benutzt."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1035,7 +1035,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:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1047,7 +1047,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1058,119 +1058,119 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, 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:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1179,7 +1179,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1188,32 +1188,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, 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:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1474,7 +1474,7 @@ msgstr "Doppelte Konfigurationsdatei %s/%s"
msgid "Failed to write file %s"
msgstr "Konnte nicht in Datei %s schreiben"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Konnte Datei %s nicht schließen"
@@ -1527,7 +1527,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datei %s/%s überschreibt die Datei in Paket %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kann %s nicht lesen"
@@ -1836,7 +1837,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1969,78 +1970,78 @@ msgstr "Konnte keine Pipe für %s öffnen"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
"geschlossen"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2053,7 +2054,7 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Konnte kein mmap von %lu Bytes durchführen"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2175,7 +2176,7 @@ msgstr "Ungültige Operation %s."
msgid "Unable to stat the mount point %s"
msgstr "Kann auf den Einhängepunkt %s nicht zugreifen."
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kann nicht nach %s wechseln"
@@ -2342,52 +2343,52 @@ msgstr "Kann Paketdatei %s nicht parsen (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kann Paketdatei %s nicht parsen (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u zu lang in der Quellliste %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
@@ -2439,7 +2440,7 @@ msgstr "Listenverzeichnis %spartial fehlt."
msgid "Archive directory %spartial is missing."
msgstr "Archivverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2462,12 +2463,12 @@ msgstr ""
" »%s«\n"
"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem »%s« wird nicht unterstützt"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
@@ -2596,11 +2597,11 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2609,7 +2610,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2618,14 +2619,14 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, 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:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
diff --git a/po/el.po b/po/el.po
index e10c02d95..91b6a09f5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-07-14 14:25EEST\n"
"Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
"org>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -653,7 +653,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -819,11 +819,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -852,7 +852,7 @@ msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθού
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
@@ -889,7 +889,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -898,7 +898,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -1000,15 +1000,15 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1016,25 +1016,25 @@ msgstr ""
"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
"στη θέση τους."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1042,7 +1042,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1054,7 +1054,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1064,118 +1064,118 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1183,7 +1183,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1192,32 +1192,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1474,7 +1474,7 @@ msgstr "Διπλό αρχείο ρυθμίσεων %s/%s"
msgid "Failed to write file %s"
msgstr "Αποτυχία εγγραφής στο αρχείο %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
@@ -1527,7 +1527,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
@@ -1831,7 +1832,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1963,77 +1964,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2046,7 +2047,7 @@ msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχ
msgid "Couldn't make mmap of %lu bytes"
msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2169,7 +2170,7 @@ msgstr "Μη έγκυρη λειτουργία %s"
msgid "Unable to stat the mount point %s"
msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Αδύνατη η αλλαγή σε %s"
@@ -2339,52 +2340,52 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
msgid "Unable to parse package file %s (2)"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Άνοιγμα του %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
@@ -2436,7 +2437,7 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται."
msgid "Archive directory %spartial is missing."
msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2459,12 +2460,12 @@ msgstr ""
" '%s'\n"
"στη συσκευή '%s' και πιέστε enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
@@ -2588,11 +2589,11 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2601,7 +2602,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2610,7 +2611,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2618,7 +2619,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
diff --git a/po/en_GB.po b/po/en_GB.po
index a0d593d31..a8fee4742 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+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"
@@ -147,7 +147,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -578,7 +578,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -737,11 +737,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -770,7 +770,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -807,7 +807,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -816,7 +816,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr ""
@@ -908,39 +908,39 @@ msgstr "Version ‘%s’ for ‘%s’ was not found"
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -948,7 +948,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -956,158 +956,158 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, 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:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1311,7 +1311,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr "Could not resolve ‘%s’"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1364,7 +1364,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1662,7 +1663,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1793,76 +1794,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr ""
@@ -1875,7 +1876,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1996,7 +1997,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2163,52 +2164,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, fuzzy, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2252,7 +2253,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2275,12 +2276,12 @@ msgstr ""
" ‘%s’\n"
"in the drive ‘%s’ and press enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Packaging system ‘%s’ is not supported"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2398,31 +2399,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, 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:775
+#: apt-pkg/acquire-item.cc:778
#, 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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 89233647c..fcc69804c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.24\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-08 20:36+0100\n"
"Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -644,7 +644,7 @@ msgstr "Fall el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
@@ -806,11 +806,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no termin el ordenamiento"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -842,7 +842,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -879,7 +879,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -888,7 +888,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
@@ -985,15 +985,15 @@ msgstr "No se encontr la versin '%s' para '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versin seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1001,25 +1001,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:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1027,7 +1027,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1039,7 +1039,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1049,118 +1049,118 @@ msgstr ""
"paquete simplemente no sea instalable y debera de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solucin de problemas rompi\n"
"algunas cosas"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, 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:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1169,7 +1169,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1178,32 +1178,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, 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:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1464,7 +1464,7 @@ msgstr "Archivo de configuracin duplicado %s/%s"
msgid "Failed to write file %s"
msgstr "Fall el cierre del archivo %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "No pude cerrar el archivo %s"
@@ -1517,7 +1517,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "El archivo %s/%s sobreescribe al que est en el paquete %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "No pude leer %s"
@@ -1821,7 +1822,7 @@ msgstr "Expir conexin a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexin"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1953,76 +1954,76 @@ msgstr "No pude abrir una tubera para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Mala lnea de cabecera"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envi una cabecera de respuesta invlida"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envi una cabecera de Content-Length invlida"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envi una cabecera de Content-Range invlida"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "ste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Error interno"
@@ -2035,7 +2036,7 @@ msgstr "No puedo hacer mmap de un fichero vaco"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No pude hacer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Seleccin %s no encontrada"
@@ -2160,7 +2161,7 @@ msgstr "Operacin invlida: %s"
msgid "Unable to stat the mount point %s"
msgstr "No se puede obtener informacin del punto de montaje %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "No se pudo cambiar a %s"
@@ -2327,52 +2328,52 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Abriendo %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, 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:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, 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)"
@@ -2426,7 +2427,7 @@ msgstr "Falta el directorio de listas %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta el directorio de archivos %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2449,12 +2450,12 @@ msgstr ""
" '%s'\n"
"en la unidad '%s' y presione Intro\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema de paquetes '%s' no est soportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -2580,11 +2581,11 @@ msgstr "Error de E/S guardando cach fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2594,7 +2595,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2603,7 +2604,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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2611,7 +2612,7 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "El tamao difiere"
diff --git a/po/eu.po b/po/eu.po
index 7310e029d..42fcecc3b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-11-07 22:37+0100\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale.org <librezale@librezale.org>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s) konpilatua: %s %s\n"
@@ -634,7 +634,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio-errorea - %s"
@@ -795,11 +795,11 @@ msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
@@ -830,7 +830,7 @@ msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -867,7 +867,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -876,7 +876,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -973,15 +973,15 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
msgid "Selected version %s (%s) for %s\n"
msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda-direktorioa blokeatu"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -989,25 +989,25 @@ msgstr ""
"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
"zaharrak erabili dira haien ordez."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1015,7 +1015,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1027,7 +1027,7 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1036,116 +1036,116 @@ msgstr ""
"Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n"
"izango, eta pakete horren errorearen berri ematea komeni da."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1153,7 +1153,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1162,32 +1162,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1441,7 +1441,7 @@ msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s"
msgid "Failed to write file %s"
msgstr "Ezin izan da %s fitxategian idatzi"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Ezin izan da %s fitxategia itxi"
@@ -1494,7 +1494,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
@@ -1801,7 +1802,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1934,76 +1935,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Barne-errorea"
@@ -2016,7 +2017,7 @@ msgstr "Ezin da fitxategi huts baten mmap egin"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ezin izan da %lu byteren mmap egin"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
@@ -2138,7 +2139,7 @@ msgstr "Eragiketa baliogabea: %s"
msgid "Unable to stat the mount point %s"
msgstr "Ezin da atzitu %s muntatze-puntua"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ezin da %s(e)ra aldatu"
@@ -2308,52 +2309,52 @@ msgstr "Ezin da %s pakete-fitxategia analizatu (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ezin da %s pakete-fitxategia analizatu (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s irekitzen"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)"
@@ -2404,7 +2405,7 @@ msgstr "%spartial zerrenda-direktorioa falta da."
msgid "Archive directory %spartial is missing."
msgstr "%spartial artxibo-direktorioa falta da."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)"
@@ -2424,12 +2425,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' pakete-sistema ez da onartzen"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu"
@@ -2547,11 +2548,11 @@ msgstr "S/I errorea iturburu-cachea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2560,7 +2561,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2569,7 +2570,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2577,7 +2578,7 @@ msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
diff --git a/po/fi.po b/po/fi.po
index fa0102ec1..2388bf637 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-15 14:09+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -639,7 +639,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -802,11 +802,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -835,7 +835,7 @@ msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
@@ -873,7 +873,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -882,7 +882,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -979,15 +979,15 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -995,25 +995,25 @@ msgstr ""
"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
"käytetty vanhoja. "
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1021,7 +1021,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1032,7 +1032,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1042,116 +1042,116 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1159,7 +1159,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1168,32 +1168,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1447,7 +1447,7 @@ msgstr "Asetustiedoston kaksoiskappale %s/%s"
msgid "Failed to write file %s"
msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Tiedoston %s sulkeminen ei onnistunut"
@@ -1500,7 +1500,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
@@ -1803,7 +1804,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1935,76 +1936,76 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2017,7 +2018,7 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ei voitu tehdä %lu tavun mmap:ia"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -2138,7 +2139,7 @@ msgstr "Virheellinen toiminto %s"
msgid "Unable to stat the mount point %s"
msgstr "Komento stat ei toiminut liitoskohdalle %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kansioon %s vaihto ei onnistu"
@@ -2305,52 +2306,52 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Avataan %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, 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)"
@@ -2399,7 +2400,7 @@ msgstr "Luettelokansio %spartial puuttuu."
msgid "Archive directory %spartial is missing."
msgstr "Arkistokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2422,12 +2423,12 @@ msgstr ""
"\"%s\"\n"
"asemaan \"%s\" ja paina Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2547,11 +2548,11 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2560,7 +2561,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2569,7 +2570,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2577,7 +2578,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Koko ei täsmää"
diff --git a/po/fr.po b/po/fr.po
index f14a10b96..f37e66292 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-11-01 18:16+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pour %s %s est compil le %s %s\n"
@@ -645,7 +645,7 @@ msgstr "Impossible de changer le nom %s en %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -808,11 +808,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a t interrompu."
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le rpertoire de tlchargement"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut tre lue."
@@ -844,7 +844,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de dterminer l'espace disponible sur %s"
@@ -885,7 +885,7 @@ msgstr "Annulation."
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de rcuprer %s %s\n"
@@ -894,7 +894,7 @@ msgstr "Impossible de rcuprer %s %s\n"
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu tre tlchargs."
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Tlchargement achev et dans le mode tlchargement uniquement"
@@ -994,15 +994,15 @@ msgstr "La version %s de %s n'a pu tre trouve"
msgid "Selected version %s (%s) for %s\n"
msgstr "Version choisie %s (%s) pour %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "La commande de mise jour ne prend pas d'argument"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossible de verrouiller le rpertoire de liste"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1010,26 +1010,26 @@ msgstr ""
"Le tlchargement de quelques fichiers d'index a chou, ils ont t "
"ignors, ou les anciens ont t utiliss la place."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erreur interne, AllUpgrade a cass le boulot!"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1037,7 +1037,7 @@ msgstr ""
"Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1049,7 +1049,7 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"t crs ou ne sont pas sortis d'Incoming."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1058,118 +1058,118 @@ msgstr ""
"Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n"
"probablement pas installable et vous devriez envoyer un rapport de bogue."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "L'information suivante devrait vous aider rsoudre la situation: "
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Paquets dfectueux"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplmentaires suivants seront installs: "
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Paquets suggrs:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Paquets recommands:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Calcul de la mise jour... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "chec"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de rsolution du problme a cass certaines "
"parties"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spcifier au moins un paquet source"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ncessit de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ncessit de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Rcupration des sources %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "chec lors de la rcupration de quelques archives."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de dcompactage %s a chou.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction %s a chou.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "chec du processus fils"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spcifier au moins un paquet pour vrifier les dpendances de "
"construction"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dpendances de construction pour %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dpendance de construction.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1178,7 +1178,7 @@ msgstr ""
"La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne "
"peut tre trouv"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1187,33 +1187,33 @@ msgstr ""
"La dpendance %s vis--vis de %s ne peut tre satisfaite car aucune version "
"du paquet %s ne peut satisfaire la version requise"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dpendance %s pour %s: le paquet install %s "
"est trop rcent"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dpendances %s pour %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dpendances de construction"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Modules reconnus:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1473,7 +1473,7 @@ msgstr "Fichier de configuration en double %s/%s"
msgid "Failed to write file %s"
msgstr "Erreur d'criture du fichier %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "chec de clture du fichier %s"
@@ -1526,7 +1526,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Le fichier %s/%s crase celui inclus dans le paquet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
@@ -1835,7 +1836,7 @@ msgstr "Dlai de connexion au port de donnes dpass"
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problme de hachage du fichier"
@@ -1972,76 +1973,76 @@ msgstr "Ne parvient pas ouvrir le tube pour %s"
msgid "Read error from %s process"
msgstr "Erreur de lecture du processus %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tte"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tte au-dessus du caractre %u"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tte"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoy un en-tte Content-Length invalide"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoy un en-tte Content-Range invalide"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possde un support des limites non-valide"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Slection dfaillante"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Dlai de connexion dpass"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Erreur d'criture du fichier de sortie"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Erreur d'criture sur un fichier"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Erreur d'criture sur le fichier"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Mauvais en-tte de donne"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "chec de la connexion"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Erreur interne"
@@ -2054,7 +2055,7 @@ msgstr "Impossible de mapper un fichier vide en mmoire"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossible de raliser un mapping de %lu octets en mmoire"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "La slection %s n'a pu tre trouve"
@@ -2177,7 +2178,7 @@ msgstr "L'opration %s n'est pas valable"
msgid "Unable to stat the mount point %s"
msgstr "Impossible de localiser le point de montage %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossible d'accder %s"
@@ -2344,55 +2345,55 @@ msgstr "Impossible de traiter le fichier %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossible de traiter le fichier %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ligne %lu mal forme dans le fichier de source %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ligne %lu mal forme dans la liste de sources %s (distribution)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Ouverture de %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ligne %u mal forme dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr ""
"Le type %s est inconnu sur la ligne %u dans la liste des sources %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2447,7 +2448,7 @@ msgstr "Le rpertoire %spartial pour les listes n'existe pas."
msgid "Archive directory %spartial is missing."
msgstr "Le rpertoire d'archive %spartial n'existe pas."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Tlchargement du fichier %li de %li (%s restant)"
@@ -2469,12 +2470,12 @@ msgstr ""
"Veuillez insrer le disque %s dans le lecteur %s et appuyez sur la "
"touche Entre."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Le systme de paquet %s n'est pas support"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossible de dterminer un type du systme de paquets adquat"
@@ -2605,11 +2606,11 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2619,7 +2620,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2628,7 +2629,7 @@ 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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2636,7 +2637,7 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Taille incohrente"
diff --git a/po/he.po b/po/he.po
index 2ca30449f..07848e46a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+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"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -535,7 +535,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -698,11 +698,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "רשימת המקורות לא ניתנת לקריאה."
@@ -731,7 +731,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "אין לך מספיק מקום פנוי ב-%s."
@@ -766,7 +766,7 @@ msgstr "בטל."
msgid "Do you want to continue [Y/n]? "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
@@ -775,7 +775,7 @@ msgstr "כשלון בהבאת %s %s\n"
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
@@ -867,45 +867,45 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -913,159 +913,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, 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:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1266,7 +1266,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr "כשלון בפענוח %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1319,7 +1319,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1615,7 +1616,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1746,76 +1747,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr ""
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr ""
@@ -1828,7 +1829,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1949,7 +1950,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2116,52 +2117,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2205,7 +2206,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2225,12 +2226,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2348,31 +2349,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, 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:775
+#: apt-pkg/acquire-item.cc:778
#, 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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index a418bca8d..731863ed4 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-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-15 18:03+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
@@ -640,7 +640,7 @@ msgstr "Nem sikerült átnevezni a következőt: %s erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -803,11 +803,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba egy eltérítés hozzáadásakor"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -836,7 +836,7 @@ msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
@@ -873,7 +873,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nem sikerült letölteni a következőt: %s %s\n"
@@ -882,7 +882,7 @@ msgstr "Nem sikerült letölteni a következőt: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -979,15 +979,15 @@ msgstr "'%s' verzió ehhez: '%s' nem található"
msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -995,26 +995,26 @@ msgstr ""
"Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a "
"régi változatuk lesz használva."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Nem található a(z) %s csomag"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1022,7 +1022,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1034,7 +1034,7 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1044,118 +1044,118 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "A következő információ talán segít megoldani a helyzetet:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "A következő extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrásarchívot kell letölteni.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrásarchívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1164,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1173,32 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verziókövetelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1450,7 +1450,7 @@ msgstr "Dupla %s/%s konfigurációs fájl"
msgid "Failed to write file %s"
msgstr "Nem sikerült a(z) %s fájlba írni"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Nem sikerült a(z) %s fájlt bezárni"
@@ -1503,7 +1503,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "A(z) %s nem olvasható"
@@ -1810,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1942,76 +1943,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba a(z) %s folyamattól"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Kapcsolódás sikertelen"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Belső hiba"
@@ -2025,7 +2026,7 @@ msgstr "Nem lehet mmap-olni egy üres fájlt"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nem sikerült %lu bájtot mmap-olni"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "A(z) %s kiválasztás nem található"
@@ -2147,7 +2148,7 @@ msgstr "%s érvénytelen művelet"
msgid "Unable to stat the mount point %s"
msgstr "%s csatlakoztatási pont nem érhető el"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nem sikerült a következőre váltani: %s"
@@ -2314,52 +2315,52 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "A(z) %lu. sor hibás %s forráslistában (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "A(z) %lu. sor hibás %s forráslistában (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s megnyitása"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú %s forráslistában."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)"
@@ -2410,7 +2411,7 @@ msgstr "%spartial listakönyvtár hiányzik."
msgid "Archive directory %spartial is missing."
msgstr "%spartial archívumkönyvtár hiányzik."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2433,12 +2434,12 @@ msgstr ""
" %s\n"
"címkéjű lemezt a(z) %s meghajtóba és üss entert\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "A(z) '%s' csomagrendszer nem támogatott"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "A megfelelő csomagrendszer típusa nem határozható meg"
@@ -2563,11 +2564,11 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2576,7 +2577,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2585,14 +2586,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
diff --git a/po/it.po b/po/it.po
index cb0f28ec7..7aeeec87b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-10-05 17:38+0200\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -147,7 +147,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -634,7 +634,7 @@ msgstr "Impossibile rinominare %s in %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
@@ -798,11 +798,11 @@ msgstr "I pacchetti devono essere rimossi ma il remove disabilitato."
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non terminato"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non pu essere letta."
@@ -833,7 +833,7 @@ msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
@@ -872,7 +872,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
@@ -881,7 +881,7 @@ msgstr "Impossibile ottenere %s %s\n"
msgid "Some files failed to download"
msgstr "Il download di alcuni file fallito"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalit download-only"
@@ -981,15 +981,15 @@ msgstr "Non stata trovata la versione '%s' per '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versione selezionata %s (%s) per %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossibile creare un lock sulla directory di list"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -997,26 +997,26 @@ msgstr ""
"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
"si useranno quelli precedenti."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1024,7 +1024,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1036,7 +1036,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1046,116 +1046,116 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, problem resolver ha rotto qualcosa"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non sufficente"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr " necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr " necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Non stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1164,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1173,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch nessuna versione "
"del pacchetto %s pu soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s "
" troppo nuovo"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s: %s fallita"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione fallito"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1460,7 +1460,7 @@ msgstr "File di configurazione duplice %s/%s"
msgid "Failed to write file %s"
msgstr "Impossibile scrivere il file %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Chiusura del file %s fallita"
@@ -1514,7 +1514,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
@@ -1817,7 +1818,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati"
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1953,77 +1954,77 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Si ottenuto una singola linea di header su %u caratteri"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un Content-Length non valido"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un Content-Range non valido"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha il supporto del range bacato"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Errore interno"
@@ -2036,7 +2037,7 @@ msgstr "Impossibile eseguire mmap su un file vuoto"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossibile eseguire mmap di %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
@@ -2161,7 +2162,7 @@ msgstr "Operazione non valida %s"
msgid "Unable to stat the mount point %s"
msgstr "Impossibile accedere al mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossibile raggiungere %s"
@@ -2329,52 +2330,52 @@ msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "La linea %lu in %s (URI) non corretta"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "La linea %lu in %s (dist) non corretta"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "La linea %lu in %s (URI parse) non corretta"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non corretta"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "La linea %lu in %s (dist parse) non corretta"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Apertura di %s in corso"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linea %u troppo lunga nel source list %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La linea %u in %s (type) non corretta"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Il tipo '%s' non riconosciuto alla linea %u nella lista sorgente %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La linea %u in %s (vendor id) non corretta"
@@ -2425,7 +2426,7 @@ msgstr "Manca la directory di liste %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Manca la directory di archivio %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Scaricamento del file %li di %li (%s rimanente)"
@@ -2447,12 +2448,12 @@ msgstr ""
"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
"invio."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di archiviazione (packaging) '%s' non supportato"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -2578,11 +2579,11 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2592,7 +2593,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2601,7 +2602,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2609,7 +2610,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
diff --git a/po/ja.po b/po/ja.po
index 2632266ea..2feec2ce8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-09 12:54+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -638,7 +638,7 @@ msgstr "%s %s ˥͡ǤޤǤ"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "ɽŸ顼 - %s"
@@ -803,11 +803,11 @@ msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ"
msgid "Internal error, Ordering didn't finish"
msgstr "顼diversion ɲ"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "ɥǥ쥯ȥåǤޤ"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "ΥꥹȤɤळȤǤޤ"
@@ -836,7 +836,7 @@ msgstr "Ÿɲä %sB Υǥ̤񤵤ޤ\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ÿ %sB Υǥ̤ޤ\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s ˽ʬʶڡޤ"
@@ -873,7 +873,7 @@ msgstr "Ǥޤ"
msgid "Do you want to continue [Y/n]? "
msgstr "³Ԥޤ [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s μ˼Ԥޤ %s\n"
@@ -882,7 +882,7 @@ msgstr "%s μ˼Ԥޤ %s\n"
msgid "Some files failed to download"
msgstr "ĤΥեμ˼Ԥޤ"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "ɥ꡼⡼ɤǥѥåΥɤλޤ"
@@ -981,15 +981,15 @@ msgstr "'%2$s' ΥС '%1$s' ĤޤǤ"
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s ˤϥС %1$s (%2$s) 򤷤ޤ\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "update ޥɤϰޤ"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "list ǥ쥯ȥå뤳ȤǤޤ"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -997,27 +997,27 @@ msgstr ""
"ĤΥǥåեΥɤ˼Ԥޤ̵뤵줿"
"뤤ϸŤΤѤޤ"
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "顼AllUpgrade ˲ޤ"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "ѥå %s դޤ"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ": ɽ '%2$s' Ф %1$s 򤷤ޤ\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷"
"ޤ:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1025,7 +1025,7 @@ msgstr ""
"̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ"
"Ƥ)"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1037,7 +1037,7 @@ msgstr ""
"Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n"
"ƤΤȹͤޤ"
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1047,117 +1047,117 @@ msgstr ""
"ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n"
""
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "줿ѥå"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "ƥѥå:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "侩ѥå:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "åץ졼ɥѥå򸡽ФƤޤ... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "λ"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "顼AllUpgrade ˲ޤ"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s ΥѥåĤޤ"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s ˽ʬʶڡޤ"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB %1$sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr " %s \n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "ĤΥ֤μ˼Ԥޤ"
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ÿޥ '%s' Ԥޤ\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ӥɥޥ '%s' Ԥޤ\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "ҥץԤޤ"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s build-dependency 뤳ȤǤޤ"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ˤ build depends ꤵƤޤ\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1166,7 +1166,7 @@ msgstr ""
"ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط"
"Ǥޤ"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1175,32 +1175,32 @@ msgstr ""
"ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s "
" %1$s ΰ¸طȤǤޤ"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s Build-dependency ȤǤޤǤ"
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "build dependency ν˼Ԥޤ"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "ݡȤƤ⥸塼:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1455,7 +1455,7 @@ msgstr "ե %s/%s ʣƤޤ"
msgid "Failed to write file %s"
msgstr "%s ν񤭹ߤ˼Ԥޤ"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "%s Υ˼Ԥޤ"
@@ -1509,7 +1509,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "ե %s/%s ѥå %s ΤΤ񤭤ޤ"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "%s ɤ߹ळȤǤޤ"
@@ -1813,7 +1814,7 @@ msgstr "ǡå³ॢ"
msgid "Unable to accept connection"
msgstr "³ accept Ǥޤ"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "եΥϥåǤ"
@@ -1945,76 +1946,76 @@ msgstr "%s Фƥѥפ򳫤ޤǤ"
msgid "Read error from %s process"
msgstr "%s ץɤ߹ߥ顼"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "إåԵǤ"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u ʸۤ 1 ԤΥإåޤ"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "ʥإåԤǤ"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "http Фʥץ饤إåƤޤ"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http Ф Content-Length إåƤޤ"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http Ф Content-Range إåƤޤ"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "http ФΥ󥸥ݡȤƤޤ"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "եեޥåȤǤ"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "select ˼Ԥޤ"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "³ॢ"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "ϥեؤν񤭹ߤǥ顼ȯޤ"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "եؤν񤭹ߤǥ顼ȯޤ"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "եؤν񤭹ߤǥ顼ȯޤ"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "⡼¦³ƥФɤ߹ߤ˼Ԥޤ"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Фɤ߹ߤ˼Ԥޤ"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "ʥإåǤ"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "³"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "顼"
@@ -2027,7 +2028,7 @@ msgstr "Υե mmap Ǥޤ"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu ХȤ mmap ǤޤǤ"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "򤵤줿 %s Ĥޤ"
@@ -2148,7 +2149,7 @@ msgstr " %s"
msgid "Unable to stat the mount point %s"
msgstr "ޥȥݥ %s stat Ǥޤ"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "%s ѹ뤳ȤǤޤ"
@@ -2315,52 +2316,52 @@ msgstr "ѥåե %s ᤹뤳ȤǤޤ (1)"
msgid "Unable to parse package file %s (2)"
msgstr "ѥåե %s ᤹뤳ȤǤޤ (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "ꥹ %2$s %1$lu ܤǤ (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "ꥹ %2$s %1$lu ܤǤ (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "ꥹ %2$s %1$lu ܤǤ (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "ꥹ %2$s %1$lu ܤǤ (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "ꥹ %2$s %1$lu ܤǤ (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s 򥪡ץ󤷤Ƥޤ"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "ꥹ %2$s %1$u ܤĹ᤮ޤ"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ꥹ %2$s %1$u ܤǤ (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "ꥹ %3$s %2$u Ԥˤ륿 '%1$s' Ǥ"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "ꥹ %2$s %1$u ܤǤ (vendor id)"
@@ -2411,7 +2412,7 @@ msgstr "ꥹȥǥ쥯ȥ %spartial Ĥޤ"
msgid "Archive directory %spartial is missing."
msgstr "֥ǥ쥯ȥ %spartial Ĥޤ"
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2434,12 +2435,12 @@ msgstr ""
" '%s'\n"
"ȥ٥դǥɥ饤 '%s' enter 򲡤Ƥ\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ѥå󥰥ƥ '%s' ϥݡȤƤޤ"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "ŬڤʥѥåƥॿפǤޤ"
@@ -2563,11 +2564,11 @@ msgstr "å¸ IO 顼ȯޤ"
msgid "rename failed, %s (%s -> %s)."
msgstr "͡˼Ԥޤ%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum Ŭ礷ޤ"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2576,7 +2577,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ (¸ߤʤƥΤ)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2585,7 +2586,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ"
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2593,7 +2594,7 @@ msgstr ""
"ѥåǥåե뤬Ƥޤѥå %s Filename: "
"եɤޤ"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Ŭ礷ޤ"
diff --git a/po/ko.po b/po/ko.po
index 38029aae1..23827460b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-10 21:56+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <cwryu@debian.org>\n"
@@ -145,7 +145,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -635,7 +635,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -799,11 +799,11 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다.
msgid "Internal error, Ordering didn't finish"
msgstr "diversion을 추가하는 데 내부 오류"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
@@ -832,7 +832,7 @@ msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
@@ -872,7 +872,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
@@ -881,7 +881,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
@@ -979,15 +979,15 @@ msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다"
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "목록 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -995,26 +995,26 @@ msgstr ""
"일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버"
"전을 대신 사용합니다."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1022,7 +1022,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1033,7 +1033,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1042,115 +1042,115 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "망가진 꾸러미"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "다음 꾸러미를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1159,7 +1159,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1168,32 +1168,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1446,7 +1446,7 @@ msgstr "%s/%s 설정 파일이 중복되었습니다"
msgid "Failed to write file %s"
msgstr "%s 파일을 쓰는 데 실패했습니다"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "%s 파일을 닫는 데 실패했습니다"
@@ -1499,7 +1499,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
@@ -1801,7 +1802,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1933,76 +1934,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "내부 오류"
@@ -2015,7 +2016,7 @@ msgstr "빈 파일에 mmap할 수 없습니다"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu바이트를 mmap할 수 없습니다"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
@@ -2136,7 +2137,7 @@ msgstr "잘못된 작업 %s"
msgid "Unable to stat the mount point %s"
msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "%s 디렉토리로 이동할 수 없습니다"
@@ -2303,52 +2304,52 @@ msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)"
msgid "Unable to parse package file %s (2)"
msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s 파일을 여는 중입니다"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "소스 리스트 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)"
@@ -2398,7 +2399,7 @@ msgstr "목록 디렉토리 %spartial이 빠졌습니다."
msgid "Archive directory %spartial is missing."
msgstr "아카이브 디렉토리 %spartial이 빠졌습니다."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2421,12 +2422,12 @@ msgstr ""
"디스크를 넣고 enter를 누르십시오\n"
" '%1$s'\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다"
@@ -2544,11 +2545,11 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2557,7 +2558,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2566,14 +2567,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
diff --git a/po/nb.po b/po/nb.po
index cad2d40c4..34cfc1d6e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n"
@@ -162,7 +162,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -653,7 +653,7 @@ msgstr "Klarte ikke endre navnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulrt uttrykk - %s"
@@ -816,11 +816,11 @@ msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Det oppsto en intern feil nr avledningen ble lagt til"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Klarer ikke lse nedlastingsmappa"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -849,7 +849,7 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
@@ -887,7 +887,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke skaffe %s %s\n"
@@ -896,7 +896,7 @@ msgstr "Klarte ikke skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
@@ -994,15 +994,15 @@ msgstr "Versjon %s av %s ble ikke funnet"
msgid "Selected version %s (%s) for %s\n"
msgstr "Utvalgt versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kan ikke lse listemappa"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1010,25 +1010,25 @@ msgstr ""
"Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
"ble brukt isteden. "
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1036,7 +1036,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1048,7 +1048,7 @@ msgstr ""
"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1058,122 +1058,122 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du br fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Utfrt"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr "Du m angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m angi minst en pakke du vil sjekke builddeps for"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1182,32 +1182,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1462,7 +1462,7 @@ msgstr "Dobbel oppsettsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Klarte ikke skrive fila %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Klarte ikke lukke fila %s"
@@ -1515,7 +1515,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke lese %s"
@@ -1822,7 +1823,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1954,76 +1955,76 @@ msgstr "Klarte ikke pne rr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Venter p hoder"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "delagt hodelinje"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Intern feil"
@@ -2036,7 +2037,7 @@ msgstr "Kan ikke utfre mmap p en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke lage mmap av %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -2157,7 +2158,7 @@ msgstr "Ugyldig operasjon %s"
msgid "Unable to stat the mount point %s"
msgstr "Klarer ikke fastsette monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Klarer ikke endre %s"
@@ -2324,52 +2325,52 @@ msgstr "Klarer ikke fortolke pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarer ikke fortolke pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Feil p linje %lu i kildelista %s (nettadresse)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Feil p linje %lu i kildelista %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Feil p %lu i kildelista %s (Absolutt dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Feil p %lu i kildelista %s (dist fortolking)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "pner %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil p %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typen %s er ukjent i linje %u i kildelista %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Feil p %u i kildelista %s (selgers id)"
@@ -2419,7 +2420,7 @@ msgstr "Listemappa %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappa %spartial mangler."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2442,12 +2443,12 @@ msgstr ""
" %s\n"
"i %s og trykk Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet %s stttes ikke"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2567,11 +2568,11 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2580,7 +2581,7 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2589,13 +2590,13 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Feil strrelse"
diff --git a/po/nl.po b/po/nl.po
index c5cb71693..3dc814ea2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-10 17:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -643,7 +643,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -807,11 +807,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout bij het toevoegen van een omleiding"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -840,7 +840,7 @@ msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
@@ -877,7 +877,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -886,7 +886,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -986,15 +986,15 @@ msgstr "Versie '%s' voor '%s' is niet gevonden"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1002,27 +1002,27 @@ msgstr ""
"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
"zijn oudere versies van gebruikt."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1030,7 +1030,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:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1041,7 +1041,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1051,119 +1051,119 @@ msgstr ""
"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
"best een foutrapport indienen voor dit pakket."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1172,7 +1172,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1181,32 +1181,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, 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:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1470,7 +1470,7 @@ msgstr "Dubbel configuratiebestand %s/%s"
msgid "Failed to write file %s"
msgstr "Wegschrijven van bestand %s is mislukt"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Sluiten van bestand %s is mislukt"
@@ -1523,7 +1523,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
@@ -1830,7 +1831,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1962,79 +1963,79 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Interne fout"
@@ -2047,7 +2048,7 @@ msgstr "Kan een leeg bestand niet mmappen"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kon van %lu bytes geen mmap maken"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -2172,7 +2173,7 @@ msgstr "Ongeldige operatie %s"
msgid "Unable to stat the mount point %s"
msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kan %s niet veranderen"
@@ -2342,52 +2343,52 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kon pakketbestand %s niet ontleden (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misvormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s wordt geopend"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, 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:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Type '%s' is onbekend op regel %u in bronlijst %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)"
@@ -2439,7 +2440,7 @@ msgstr "Lijstmap %spartial is afwezig."
msgid "Archive directory %spartial is missing."
msgstr "Archiefmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2462,12 +2463,12 @@ msgstr ""
" '%s'\n"
"in het station '%s' te plaatsen en op 'enter' te drukken\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2591,11 +2592,11 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2604,7 +2605,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2613,7 +2614,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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2621,7 +2622,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
diff --git a/po/nn.po b/po/nn.po
index 16e47203b..f57bba2af 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -151,7 +151,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
@@ -637,7 +637,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -801,11 +801,11 @@ msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -834,7 +834,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -872,7 +872,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -881,7 +881,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -980,15 +980,15 @@ msgstr "Fann ikkje versjonen %s av %s"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -996,26 +996,26 @@ msgstr ""
"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
"filer er brukte i staden."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1023,7 +1023,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1035,7 +1035,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1045,122 +1045,122 @@ msgstr ""
"pakken rett og slett ikkje lt seg installera. I sfall br du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, 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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1169,31 +1169,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1446,7 +1446,7 @@ msgstr "Dobbel oppsettsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Klarte ikkje skriva fila %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Klarte ikkje lukka fila %s"
@@ -1499,7 +1499,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
@@ -1805,7 +1806,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1937,76 +1938,76 @@ msgstr "Klarte ikkje opna ryr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fr %s-prosessen"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Intern feil"
@@ -2019,7 +2020,7 @@ msgstr "Kan ikkje utfra mmap p ei tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikkje laga mmap av %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -2140,7 +2141,7 @@ msgstr "Ugyldig operasjon %s"
msgid "Unable to stat the mount point %s"
msgstr "Klarte ikkje f status til monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Klarte ikkje byta til %s"
@@ -2307,52 +2308,52 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Klarte ikkje tolka pakkefila %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Opnar %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
@@ -2403,7 +2404,7 @@ msgstr "Listekatalogen %spartial manglar."
msgid "Archive directory %spartial is missing."
msgstr "Arkivkatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2426,12 +2427,12 @@ msgstr ""
" %s\n"
"i stasjonen %s og trykk Enter.\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet %s er ikkje sttta"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2550,11 +2551,11 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2563,7 +2564,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2571,14 +2572,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, 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:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Feil storleik"
diff --git a/po/pl.po b/po/pl.po
index 936c6e99c..54e94c641 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-11 11:47+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s dla %s %s skompilowany %s %s\n"
@@ -640,7 +640,7 @@ msgstr "Nie udao si zmieni nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Bd kompilacji wyraenia regularnego - %s"
@@ -803,11 +803,11 @@ msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone."
msgid "Internal error, Ordering didn't finish"
msgstr "Bd wewntrzny przy dodawaniu objazdu"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Nie udao si zablokowa katalogu pobierania"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nie udao si odczyta list rde."
@@ -836,7 +836,7 @@ msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca"
@@ -873,7 +873,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Czy chcesz kontynuowa [T/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udao si pobra %s %s\n"
@@ -882,7 +882,7 @@ msgstr "Nie udao si pobra %s %s\n"
msgid "Some files failed to download"
msgstr "Nie udao si pobra niektrych plikw"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Ukoczono pobieranie w trybie samego pobierania"
@@ -981,15 +981,15 @@ msgstr "Wersja '%s' dla '%s' nie zostaa znaleziona"
msgid "Selected version %s (%s) for %s\n"
msgstr "Wybrano wersj %s (%s) dla %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga adnych argumentw"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nie udao si zablokowa katalogu list"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -997,25 +997,25 @@ msgstr ""
"Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub "
"zostaa uyta ich starsza wersja."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udao si odnale pakietu %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1023,7 +1023,7 @@ msgstr ""
"Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub "
"podaj rozwizanie)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1035,7 +1035,7 @@ msgstr ""
"niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n"
"lub przeniesione z katalogu Incoming (\"Przychodzce\")."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1045,120 +1045,120 @@ msgstr ""
"danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n"
"bd."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Pakiety s bdne"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Nie udao si"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane "
"rda"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udao si odnale rda dla pakietu %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiww rde.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiww rde.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz rdo %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Nie udao si pobra niektrych archiww."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Proces potomny zawid"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety "
"wymagane do budowania"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie udao si pobra informacji o zalenociach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zalenoci czasu budowania.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1167,7 +1167,7 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,32 +1176,32 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udao si speni zalenoci %s od %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udao si speni zalenoci na czas budowania od %s."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Nie udao si przetworzy zalenoci na czas budowania"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Obsugiwane moduy:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1458,7 +1458,7 @@ msgstr "Zduplikowany plik konfiguracyjny %s/%s"
msgid "Failed to write file %s"
msgstr "Nie udao si zapisa pliku %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Nie udao si zamkn pliku %s"
@@ -1511,7 +1511,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nie mona czyta %s"
@@ -1815,7 +1816,7 @@ msgstr "Przekroczony czas poczenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udao si przyj poczenia"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udao si obliczy skrtu pliku"
@@ -1947,76 +1948,76 @@ msgstr "Nie udao si otworzy potoku dla %s"
msgid "Read error from %s process"
msgstr "Bd odczytu z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagwki"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Nieprawidowa linia nagwka"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Operacja select nie powioda si"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Przekroczenie czasu poczenia"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Bd przy pisaniu do pliku wyjciowego"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Bd czytania z serwera"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Bdne dane nagwka"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Poczenie nie udao si"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Bd wewntrzny"
@@ -2029,7 +2030,7 @@ msgstr "Nie mona wykona mmap na pustym pliku"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udao si wykona mmap %lu bajtw"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -2151,7 +2152,7 @@ msgstr "Nieprawidowa operacja %s"
msgid "Unable to stat the mount point %s"
msgstr "Nie udao si wykona operacji stat na punkcie montowania %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nie udao si przej do %s"
@@ -2318,52 +2319,52 @@ msgstr "Nie udao si zanalizowa pliku pakietu %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nie udao si zanalizowa pliku pakietu %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Nieprawidowa linia %lu w licie rde %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawidowa linia %lu w licie rde %s (dystrybucja)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Nieprawidowa linia %lu w licie rde %s (analiza URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Nieprawidowa linia %lu w licie rde %s (bezwzgldna dystrybucja)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawidowa linia %lu w licie rde %s (analiza dystrybucji)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otwieranie %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u w licie rde %s jest zbyt duga."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidowa linia %u w licie rde %s (typ)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typ '%s' jest nieznany - linia %u listy rde %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Nieprawidowa linia %u w licie rde %s (identyfikator producenta)"
@@ -2414,7 +2415,7 @@ msgstr "Brakuje katalogu list %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Brakuje katalogu archiww %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2437,12 +2438,12 @@ msgstr ""
" '%s'\n"
"do napdu '%s' i nacisn enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakietw '%s' nie jest obsugiwany"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw"
@@ -2565,11 +2566,11 @@ msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udao si zmieni nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2578,7 +2579,7 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2587,14 +2588,14 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Bdny rozmiar"
diff --git a/po/pt.po b/po/pt.po
index 68a6d730a..af44e7f15 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-03-07 22:20+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -635,7 +635,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -799,11 +799,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno ao adicionar um desvio"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: 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."
@@ -833,7 +833,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Desculpe, você não tem espaço suficiente em %s"
@@ -870,7 +870,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Você deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
@@ -879,7 +879,7 @@ msgstr "Falha ao obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
@@ -978,15 +978,15 @@ msgstr "Versão '%s' para '%s' não foi encontrada"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no directório de listas"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -994,25 +994,25 @@ msgstr ""
"Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1020,7 +1020,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1032,7 +1032,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1043,119 +1043,119 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, 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:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, 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:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1164,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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1173,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, 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:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1456,7 +1456,7 @@ msgstr "Arquivo de configuração duplicado %s/%s"
msgid "Failed to write file %s"
msgstr "Falha ao escrever ficheiro %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Falha ao fechar ficheiro %s"
@@ -1509,7 +1509,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1812,7 +1813,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1944,76 +1945,76 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Erro interno"
@@ -2026,7 +2027,7 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selecção %s não encontrada"
@@ -2149,7 +2150,7 @@ msgstr "Operação %s inválida"
msgid "Unable to stat the mount point %s"
msgstr "Impossível executar stat ao ponto de montagem %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossível mudar para %s"
@@ -2316,52 +2317,52 @@ msgstr "Impossível o parse ao ficheiro de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossível o parse ao ficheiro de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, 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:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
@@ -2413,7 +2414,7 @@ msgstr "Falta directório de listas %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta o diretório de repositório %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2436,12 +2437,12 @@ msgstr ""
" '%s'\n"
"na drive '%s' e pressione enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento aplicável"
@@ -2567,11 +2568,11 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2581,7 +2582,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,7 +2591,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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2598,7 +2599,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Tamanho incorreto"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6f28b8a77..54946a2c4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-06-16 10:24-0300\n"
"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -637,7 +637,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilao de regex - %s"
@@ -800,11 +800,11 @@ msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno ao adicionar um desvio"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Impossvel criar lock no diretrio de download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "A lista de fontes no pde ser lida."
@@ -834,7 +834,7 @@ msgstr ""
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:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Desculpe, voc no tem espao suficiente em %s"
@@ -871,7 +871,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Quer continuar [S/n] ? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao baixar %s %s\n"
@@ -880,7 +880,7 @@ msgstr "Falha ao baixar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
@@ -979,15 +979,15 @@ msgstr "Verso '%s' para '%s' no foi encontrada"
msgid "Selected version %s (%s) for %s\n"
msgstr "Verso selecionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "O comando update no leva argumentos"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Impossvel criar lock no diretrio de listas"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -995,25 +995,25 @@ msgstr ""
"Alguns arquivos de ndice falharam no download, eles foram ignorados ou os "
"antigos foram usados em seu lugar."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossvel achar pacote %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expresso regular '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1021,7 +1021,7 @@ msgstr ""
"Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma soluo)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1033,7 +1033,7 @@ msgstr ""
"distribuio instvel, que alguns pacotes requeridos no foram \n"
"criados ainda ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1043,117 +1043,117 @@ msgstr ""
"esteja simplesmente no instalvel e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir sero instalados:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Calculando Atualizao... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossvel encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Fonte %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Falha ao fazer o download de alguns arquivos."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construo '%s' falhou.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tem dependncias de construo.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1162,7 +1162,7 @@ msgstr ""
"a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no "
"pde ser encontrado"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1171,32 +1171,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependncia %s para %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependncias de construo"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Mdulos Suportados:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1453,7 +1453,7 @@ msgstr "Arquivo de confgiurao duplicado %s/%s"
msgid "Failed to write file %s"
msgstr "Falha ao gravar arquivo %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Falha ao fechar arquivo %s"
@@ -1506,7 +1506,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Impossvel ler %s"
@@ -1812,7 +1813,7 @@ msgstr "Conexo do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossvel aceitar conexo"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
@@ -1944,76 +1945,76 @@ msgstr "No foi possvel abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Aguardando por cabealhos"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma nica linha de cabealho acima de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Linha de cabealho ruim"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabealho de resposta invlido"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabealho Conten-Length invlido"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabealho Conten-Range invlido"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range quebrado"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Seleo falhou."
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Conexo expirou"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de sada"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor Ponto remoto fechou a conexo"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Dados de cabealho ruins"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Conexo falhou."
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Erro interno"
@@ -2026,7 +2027,7 @@ msgstr "No foi possvel fazer mmap de arquivo vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossvel fazer mmap de %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Seleo %s no encontrada"
@@ -2149,7 +2150,7 @@ msgstr "Operao %s invlida"
msgid "Unable to stat the mount point %s"
msgstr "Impossvel checar o ponto de montagem %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Impossvel mudar para %s"
@@ -2316,52 +2317,52 @@ msgstr "Impossvel analizar arquivo de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossvel analizar arquivo de pacote %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Abrindo %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na sources.lits %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Tipo '%s' no conhecido na linha %u na lista de fontes %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
@@ -2413,7 +2414,7 @@ msgstr "Diretrio de listas %spartial est faltando."
msgid "Archive directory %spartial is missing."
msgstr "Diretrio de repositrio %spartial est faltando."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2436,12 +2437,12 @@ msgstr ""
" '%s'\n"
"no drive '%s' e pressione enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' no suportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"No foi possvel determinar um tipo de sistema de empacotamento aplicvel."
@@ -2567,11 +2568,11 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeao falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2581,7 +2582,7 @@ msgstr ""
"que voc precisa consertar manualmente este pacote. (devido a arquitetura "
"no especificada)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,7 +2591,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:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2598,7 +2599,7 @@ msgstr ""
"Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Tamanho incorreto"
diff --git a/po/ro.po b/po/ro.po
index 9d1e7b34c..9497f70b2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-08-25 17:43+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -644,7 +644,7 @@ msgstr "Eşuare în a redenumi %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -807,11 +807,11 @@ msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă în timpul adăugării unei diversiuni"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -840,7 +840,7 @@ msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nu aveţi suficient spaţiu în %s"
@@ -878,7 +878,7 @@ msgstr "Renunţare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreţi să continuaţi [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
@@ -887,7 +887,7 @@ msgstr "Eşuare în aducerea %s %s\n"
msgid "Some files failed to download"
msgstr "Eşuare în descărcarea unor fişiere"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
@@ -984,15 +984,15 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1000,25 +1000,25 @@ msgstr ""
"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:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1026,7 @@ msgstr ""
"Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet "
"(sau oferiţi o altă soluţie)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1039,7 +1039,7 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1049,117 +1049,117 @@ 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:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Eşuare"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, 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:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele "
"înglobate"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1168,7 +1168,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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1177,32 +1177,32 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, 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:2325
+#: cmdline/apt-get.cc:2321
#, 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:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1461,7 +1461,7 @@ msgstr "Fişier de configurare duplicat %s/%s"
msgid "Failed to write file %s"
msgstr "Eşuare în a scrie fişierul %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Eşuare în a închide fişierul %s"
@@ -1514,7 +1514,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nu pot citi %s"
@@ -1820,7 +1821,7 @@ msgstr "Timp de conectare data socket expirat"
msgid "Unable to accept connection"
msgstr "Nu pot accepta conexiune"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
@@ -1952,77 +1953,77 @@ msgstr "Nu pot deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "În aşteptarea antetelor"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Primit o singură linie de antet peste %u caractere"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Acest server http are zonă de suport necorespunzătoare"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Eroare internă"
@@ -2035,7 +2036,7 @@ msgstr "Nu pot mmap un fişier gol"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nu pot face mmap la %lu bytes"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Selecţia %s nu s-a găsit"
@@ -2158,7 +2159,7 @@ msgstr "Operaţiune invalidă %s"
msgid "Unable to stat the mount point %s"
msgstr "Nu pot determina starea punctului de montare %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nu pot schimba la %s"
@@ -2325,52 +2326,52 @@ msgstr "Nu pot analiza fişierul pachet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nu pot analiza fişierul pachet %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Deschidere %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, 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)"
@@ -2421,7 +2422,7 @@ msgstr "Directorul de liste %spartial lipseşte."
msgid "Archive directory %spartial is missing."
msgstr "Directorul de arhive %spartial lipseşte."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2444,12 +2445,12 @@ msgstr ""
" '%s'\n"
"în unitatea '%s' şi apăsaţi Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistemul de pachete '%s' nu este suportat"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu pot determina un tip de sistem de pachete potrivit"
@@ -2575,11 +2576,11 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2588,7 +2589,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,7 +2598,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2605,7 +2606,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
diff --git a/po/ru.po b/po/ru.po
index ab3c56f22..a9921de46 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-10-22 12:24+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -650,7 +650,7 @@ msgstr "Не удалось переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
@@ -816,11 +816,11 @@ msgstr "Пакеты необходимо удалить, но удаление
msgid "Internal error, Ordering didn't finish"
msgstr "Внутренняя ошибка, Ordering не завершилась"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог для загрузки"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
@@ -851,7 +851,7 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
@@ -890,7 +890,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось загрузить %s %s\n"
@@ -899,7 +899,7 @@ msgstr "Не удалось загрузить %s %s\n"
msgid "Some files failed to download"
msgstr "Некоторые файлы не удалось загрузить"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
@@ -997,15 +997,15 @@ msgstr "Версия '%s' для '%s' не найдена"
msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана версия %s (%s) для %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Невозможно заблокировать каталог со списками пакетов"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1013,27 +1013,27 @@ msgstr ""
"Некоторые индексные файлы не загрузились, они были проигнорированы или "
"вместо них были использованы старые версии"
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Не могу найти пакет %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1041,7 +1041,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1052,7 +1052,7 @@ msgstr ""
"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
"ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1062,120 +1062,120 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация возможно поможет Вам:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Настойчиво рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Рассчёт обновлений... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
"тексты"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось загрузить."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1184,7 +1184,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1193,32 +1193,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1474,7 +1474,7 @@ msgstr "Повторно указанный конфигурационный ф
msgid "Failed to write file %s"
msgstr "Не удалось записать в файл %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Не удалось закрыть файл %s"
@@ -1527,7 +1527,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s переписывает файл в пакете %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
@@ -1832,7 +1833,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хэшировании файла"
@@ -1968,76 +1969,76 @@ msgstr "Не удалось открыть канал для %s"
msgid "Read error from %s process"
msgstr "Ошибка чтения из процесса %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u символов"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Неверный заголовок"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-сервер послал неверный заголовок"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2050,7 +2051,7 @@ msgstr "Невозможно отобразить в память пустой
msgid "Couldn't make mmap of %lu bytes"
msgstr "Невозможно отобразить в память %lu байт"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Не найдено: %s"
@@ -2173,7 +2174,7 @@ msgstr "Неверная операция %s"
msgid "Unable to stat the mount point %s"
msgstr "Невозможно прочитать атрибуты точки монтирования %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Невозможно сменить текущий каталог на %s"
@@ -2346,53 +2347,53 @@ msgstr "Невозможно прочесть содержимое пакета
msgid "Unable to parse package file %s (2)"
msgstr "Невозможно прочесть содержимое пакета %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Открытие %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Неизвестен тип '%s' в строке %u в списке источников %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Искажённая строка %u в списке источников %s (vendor id)"
@@ -2442,7 +2443,7 @@ msgstr "Каталог %spartial отсутствует."
msgid "Archive directory %spartial is missing."
msgstr "Архивный каталог %spartial отсутствует."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Загружается файл %li из %li (%s осталось)"
@@ -2462,12 +2463,12 @@ msgstr "Метод %s запустился не корректно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Менеджер пакетов '%s' не поддерживается"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Невозможно определить подходящий тип менеджера пакетов"
@@ -2585,11 +2586,11 @@ msgstr "Ошибка ввода/вывода при попытке сохран
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2598,7 +2599,7 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2607,13 +2608,13 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Не совпадает размер"
diff --git a/po/sk.po b/po/sk.po
index 160da405e..451d2379e 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: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-07-01 09:34+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -634,7 +634,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -797,11 +797,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba pri pridávaní diverzie"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
@@ -830,7 +830,7 @@ msgstr "Po rozbalení sa na disku použije ďalších %sB.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
@@ -867,7 +867,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -876,7 +876,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
@@ -972,15 +972,15 @@ msgstr "Nebola nájdená verzia '%s' pre '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -988,25 +988,25 @@ msgstr ""
"Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa "
"použili staršie verzie."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, 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:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1014,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1026,7 +1026,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1036,124 +1036,124 @@ 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:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, 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:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, 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:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, 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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1162,31 +1162,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:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1439,7 +1439,7 @@ msgstr "Duplicitný konfiguračný súbor %s/%s"
msgid "Failed to write file %s"
msgstr "Zápis do súboru %s zlyhal"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Zatvorenie súboru %s zlyhalo"
@@ -1492,7 +1492,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Súbor %s/%s prepisuje ten z balíka %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "%s sa nedá čítať"
@@ -1796,7 +1797,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1928,76 +1929,76 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri čítaní z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2010,7 +2011,7 @@ msgstr "Nedá sa vykonať mmap prázdneho súboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nedá sa urobiť mmap %lu bajtov"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -2132,7 +2133,7 @@ msgstr "Neplatná operácia %s"
msgid "Unable to stat the mount point %s"
msgstr "Prípojný bod %s sa nedá vyhodnotiť"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nedá sa prejsť do %s"
@@ -2299,52 +2300,52 @@ msgstr "Súbor %s sa nedá spracovať (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Súbor %s sa nedá spracovať (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otvára sa %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, 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:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
@@ -2393,7 +2394,7 @@ msgstr "Adresár zoznamov %spartial chýba."
msgid "Archive directory %spartial is missing."
msgstr "Archívny adresár %spartial chýba."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2416,12 +2417,12 @@ msgstr ""
" '%s'\n"
"do mechaniky '%s' a stlačte Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém '%s' nie je podporovaný"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému"
@@ -2541,11 +2542,11 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2554,7 +2555,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2563,13 +2564,13 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, 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:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
diff --git a/po/sl.po b/po/sl.po
index 6e6a46613..92fbaaa4a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure uhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -145,7 +145,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
@@ -632,7 +632,7 @@ msgstr "Ni mogoe preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -795,11 +795,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoe brati."
@@ -828,7 +828,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
@@ -865,7 +865,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
@@ -874,7 +874,7 @@ msgstr "Ni mogoe dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
@@ -971,15 +971,15 @@ msgstr "Razliice '%s' za '%s' ni mogoe najti"
msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razliica %s (%s) za %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoe zakleniti"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -987,25 +987,25 @@ msgstr ""
"Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so "
"uporabljena stareja."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1013,7 +1013,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1024,7 +1024,7 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1034,125 +1034,125 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,31 +1161,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1440,7 +1440,7 @@ msgstr "Dvojnik datoteke z nastavitvami %s/%s"
msgid "Failed to write file %s"
msgstr "Napaka pri pisanju datoteke %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Napaka pri zapiranju datoteke %s"
@@ -1493,7 +1493,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoe brati %s"
@@ -1795,7 +1796,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1927,76 +1928,76 @@ msgstr "Ni mogoe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "akanje na glave"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Napana vrstica glave"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Strenik HTTP je poslal napano glavo odgovora"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2009,7 +2010,7 @@ msgstr "mmap prazne datoteke ni mogo"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoe narediti mmap %lu bajtov"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Izbira %s ni mogoe najti"
@@ -2131,7 +2132,7 @@ msgstr "Napana operacija %s"
msgid "Unable to stat the mount point %s"
msgstr "Ni mogoe doloiti priklopne toke %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ni mogoe spremeniti v %s"
@@ -2298,52 +2299,52 @@ msgstr "Ni mogoe razleniti paketne datoteke %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoe razleniti paketne datoteke %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Napana vrstica %lu v seznamu virov %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Odpiram %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Napana vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)"
@@ -2393,7 +2394,7 @@ msgstr "Manjka imenik s seznami %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Manjka imenik z arhivi %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2416,12 +2417,12 @@ msgstr ""
" '%s'\n"
"v enoto '%s' in pritisnite enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema"
@@ -2539,11 +2540,11 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2552,7 +2553,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket (zaradi manjkajoega arhiva)."
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2561,7 +2562,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2569,7 +2570,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
diff --git a/po/sv.po b/po/sv.po
index b93c051fe..b0d1e03ac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-11-02 23:56+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -637,7 +637,7 @@ msgstr "Misslyckades att byta namn p %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljrt uttryck - %s"
@@ -798,11 +798,11 @@ msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen frdigstlldes inte"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Kunde inte lsa hmtningskatalogen."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
@@ -833,7 +833,7 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigras p disken.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte lsa av ledigt utrymme i %s"
@@ -871,7 +871,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortstta [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades att hmta %s %s\n"
@@ -880,7 +880,7 @@ msgstr "Misslyckades att hmta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades att hmta vissa filer"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Hmtningen frdig i \"endast-hmta\"-lge"
@@ -978,15 +978,15 @@ msgstr "Version \"%s\" fr \"%s\" hittades inte"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) fr %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Kunde inte lsa listkatalogen"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -994,25 +994,25 @@ msgstr ""
"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla "
"anvnts istllet."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, vljer %s fr regex \"%s\"\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1020,7 +1020,7 @@ msgstr ""
"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
"(eller ange en lsning)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1032,7 +1032,7 @@ msgstr ""
"distributionen, att ngra krvda paket nnu inte har skapats eller\n"
"lagts in frn \"Incoming\"."
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1042,114 +1042,114 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta br\n"
"skrivas."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Fljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Freslagna paket:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Berknar uppgradering... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlsaren brt snder saker"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta ngot kllkodspaket fr %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, 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:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behver hmta %sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Hmtar kllkod %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Misslyckades att hmta vissa arkiv."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Kontrollera om paketet 'dpkg-dev' r installerat.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hmta byggberoendeinformation fr %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1157,7 +1157,7 @@ msgid ""
msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1166,32 +1166,32 @@ msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
"versioner av paketet %s uppfyller versionskraven"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden fr %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Moduler som stds:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1451,7 +1451,7 @@ msgstr "Duplicerad konfigurationsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Misslyckades att skriva filen %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Misslyckades att stnga filen %s"
@@ -1505,7 +1505,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Filen %s/%s skriver ver den i paketet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte lsa %s"
@@ -1808,7 +1809,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgrns"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutning"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lgga filen till hashtabellen"
@@ -1946,76 +1947,76 @@ msgstr "Kunde inte ppna rr fr %s"
msgid "Read error from %s process"
msgstr "Lsfel p %s-processen"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Vntar p huvuden"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam huvudrad p %u tecken"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern snde ett ogiltigt svarshuvud"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern snde ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern snde ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers std fr delvis hmtning fungerar inte"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Oknt datumformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsgrnsen fr anslutningen nddes"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Fel vid lsning frn server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Internt fel"
@@ -2028,7 +2029,7 @@ msgstr "Kan inte utfra mmap p en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utfra mmap p %lu byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s ej funnet"
@@ -2150,7 +2151,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Kunde inte ta status p monteringspunkt %s."
# Felmeddelande fr misslyckad chdir
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kunde inte g till %s"
@@ -2320,52 +2321,52 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunde inte tolka paketfilen %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "ppnar %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u fr lng i kllistan %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, 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:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Typen \"%s\" r oknd p rad %u i kllistan %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rad %u i kllistan %s har fel format (leverantrs-id)"
@@ -2416,7 +2417,7 @@ msgstr "Listkatalogen %spartial saknas."
msgid "Archive directory %spartial is missing."
msgstr "Arkivkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Laddar ner fil %li av %li (%s terstr)"
@@ -2436,13 +2437,13 @@ msgstr "Metoden %s startade inte korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" stds inte"
#
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte avgra en lmpligt paketsystemstyp"
@@ -2563,11 +2564,11 @@ msgstr "In-/utfel vid lagring av kllcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2576,7 +2577,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:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2585,13 +2586,13 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, 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:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
diff --git a/po/tl.po b/po/tl.po
index 58c30347d..18f664faf 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-11-03 03:35+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -642,7 +642,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -807,11 +807,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -842,7 +842,7 @@ msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -879,7 +879,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -888,7 +888,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -986,15 +986,15 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1002,26 +1002,26 @@ msgstr ""
"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
"mga luma na lamang."
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
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:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1029,7 +1029,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1040,7 +1040,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:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1050,115 +1050,115 @@ msgstr ""
"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
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:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "Kinakalkula ang upgrade... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
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:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, 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:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, 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:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
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:2127
+#: cmdline/apt-get.cc:2123
#, 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:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1167,7 +1167,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,32 +1176,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:2286
+#: cmdline/apt-get.cc:2282
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1457,7 +1457,7 @@ msgstr "Nadobleng talaksang conf %s/%s"
msgid "Failed to write file %s"
msgstr "Bigo sa pagsulat ng talaksang %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Bigo sa pagsara ng talaksang %s"
@@ -1510,7 +1510,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
@@ -1813,7 +1814,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1949,76 +1950,76 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
msgid "Read error from %s process"
msgstr "Error sa pagbasa mula sa prosesong %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Naghihintay ng mga header"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Maling linyang header"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "Maling datos sa header"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "Internal na error"
@@ -2031,7 +2032,7 @@ msgstr "Hindi mai-mmap ang talaksang walang laman"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Hindi makagawa ng mmap ng %lu na byte"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -2155,7 +2156,7 @@ msgstr "Di tanggap na operasyon %s"
msgid "Unable to stat the mount point %s"
msgstr "Di mai-stat ang mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Di makalipat sa %s"
@@ -2325,52 +2326,52 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, 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:89
+#: apt-pkg/sourcelist.cc:96
#, 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:92
+#: apt-pkg/sourcelist.cc:99
#, 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:98
+#: apt-pkg/sourcelist.cc:105
#, 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:105
+#: apt-pkg/sourcelist.cc:112
#, 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:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Binubuksan %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "Di kilalang uri '%s' sa linyang %u sa talaksang pagkukunan %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)"
@@ -2423,7 +2424,7 @@ msgstr "Nawawala ang directory ng talaan %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Nawawala ang directory ng arkibo %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
@@ -2444,12 +2445,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2572,11 +2573,11 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2585,7 +2586,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2594,7 +2595,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2602,7 +2603,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Di tugmang laki"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5f2be979d..6501190a1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
-"PO-Revision-Date: 2005-10-29 10:08+0800\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
+"PO-Revision-Date: 2005-11-15 00:05+0800\n"
"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -229,16 +229,15 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "请给这张光盘起个名字,比如说“Debian 2.1r1 Disk 1”"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
+msgstr "请把光盘碟片插入驱动器再按回车键"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -631,7 +630,7 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -792,11 +791,11 @@ msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 没有完成"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
@@ -825,7 +824,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
@@ -862,7 +861,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -871,7 +870,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
@@ -968,40 +967,40 @@ msgstr "未找到“%2$s”的“%1$s”版本"
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误,AllUpgrade 造成某些故障"
+msgstr "内部错误,AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1009,7 +1008,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1020,7 +1019,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1029,121 +1028,121 @@ msgstr ""
"您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对问题的解决有所帮助:"
+msgstr "下列的信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
-msgstr "将会安装下列的额外的软件包:"
+msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,problem resolver 坏事了"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, 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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1152,30 +1151,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "被支持模块:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1425,7 +1424,7 @@ msgstr "重复的配置文件 %s/%s"
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
@@ -1478,7 +1477,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1778,7 +1778,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1908,76 +1908,76 @@ msgstr "无法为 %s 开启管道"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目,它的长度超过了 %u 个字符"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "内部错误"
@@ -1990,7 +1990,7 @@ msgstr "无法 mmap 一个空文件"
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "没有发现您的所选 %s"
@@ -2111,7 +2111,7 @@ msgstr "无效的操作 %s"
msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
@@ -2278,52 +2278,52 @@ msgstr "无法解析软件包文件 %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "无法识别在安装源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
@@ -2374,7 +2374,7 @@ msgstr "软件包列表的目录 %spartial 不见了。"
msgid "Archive directory %spartial is missing."
msgstr "找不到“%spartial”这个目录。"
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "正在下载第 %li 个文件(共 %li 个,尚需 %s)"
@@ -2394,12 +2394,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2517,11 +2517,11 @@ msgstr "无法写入来源缓存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2530,7 +2530,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2538,13 +2538,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "大小不符"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 53dcde63e..f405147f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
+"POT-Creation-Date: 2005-11-23 00:39+0100\n"
"PO-Revision-Date: 2005-02-19 22:24+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -149,7 +149,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 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"
@@ -636,7 +636,7 @@ msgstr "無法將 %s 更名為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示法出錯 - %s"
@@ -799,11 +799,11 @@ msgstr "有套件需要被移除,但移除動作被禁止。"
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤:新增轉移(diversion)失敗"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載的目錄"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "無法讀取來源單。"
@@ -832,7 +832,7 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解壓縮後將空出 %sB 的空間。\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "『%s』內沒有足夠的空間。"
@@ -869,7 +869,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "繼續執行嗎? 是按 [Y] 鍵,否按 [n] 鍵 "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法下載『%s』檔案。%s\n"
@@ -878,7 +878,7 @@ msgstr "無法下載『%s』檔案。%s\n"
msgid "Some files failed to download"
msgstr "部份檔案無法下載"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
msgid "Download complete and in download only mode"
msgstr "下載完畢,目前是“僅下載”模式"
@@ -975,39 +975,39 @@ msgstr "未找到“%2$s”的“%1$s”版本"
msgid "Selected version %s (%s) for %s\n"
msgstr "選定的版本為 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1311
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1382
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1401
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1553
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1556
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1015,7 +1015,7 @@ msgstr ""
"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
"定一個解決辦法)。"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1568
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"
@@ -1026,7 +1026,7 @@ msgstr ""
"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
"或從 Incoming 目錄移除。"
-#: cmdline/apt-get.cc:1580
+#: cmdline/apt-get.cc:1576
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"
@@ -1036,122 +1036,122 @@ msgstr ""
"該套件無法安裝,您最好提交一個針對這個套件\n"
"的臭蟲報告。"
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1581
msgid "The following information may help to resolve the situation:"
msgstr "底下的資訊有助於解決現在的情況:"
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1584
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1610
msgid "The following extra packages will be installed:"
msgstr "下列的【新】套件都將被安裝:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1681
msgid "Suggested packages:"
msgstr "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1682
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1702
msgid "Calculating upgrade... "
msgstr "籌畫升級套件中..."
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1710
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1883
msgid "Must specify at least one package to fetch source for"
msgstr "必須指定至少一個對應的套件才能下載源碼"
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 套件的源碼"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1957
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1962
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1965
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1971
#, c-format
msgid "Fetch source %s\n"
msgstr "下載源碼 %s\n"
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2002
msgid "Failed to fetch some archives."
msgstr "無法下載某些檔案。"
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2042
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2043
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2060
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "執行建立套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2079
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2095
msgid "Must specify at least one package to check builddeps for"
msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2123
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的建構相依關係。"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2143
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相依關係訊息。\n"
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2195
#, 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:2251
+#: cmdline/apt-get.cc:2247
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1160,30 +1160,30 @@ msgstr ""
"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
"相依關係"
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2282
#, 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:2311
+#: cmdline/apt-get.cc:2307
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所要求的建構相依關係。"
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2325
msgid "Failed to process build dependencies"
msgstr "無法處理建構相依關係"
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2357
msgid "Supported modules:"
msgstr "支援模組:"
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2398
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1435,7 +1435,7 @@ msgstr "重複的設定檔 %s/%s"
msgid "Failed to write file %s"
msgstr "寫入檔案 %s 失敗"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "關閉檔案 %s 失敗"
@@ -1488,7 +1488,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取『%s』。"
@@ -1788,7 +1789,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法允許連線"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
@@ -1920,76 +1921,76 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "從 %s 進程讀取錯誤"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "壞的標頭"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr "http 伺服器傳送一個無效的回覆標頭"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "http 伺服器有損毀的範圍支援"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:797
+#: methods/http.cc:834
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:822
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:836
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "從遠端主機讀取錯誤,關閉連線"
-#: methods/http.cc:838
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1086
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1177
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "內部錯誤"
@@ -2002,7 +2003,7 @@ msgstr "不能將空白檔案讀入記憶體"
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法讀入檔案 %lu 位元組至記憶體"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "選項『%s』找不到。"
@@ -2123,7 +2124,7 @@ msgstr "無效的操作:%s"
msgid "Unable to stat the mount point %s"
msgstr "無法讀取掛載點 %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "無法進入『%s』目錄。"
@@ -2290,52 +2291,52 @@ msgstr "無法辨識套件『%s』(1)。"
msgid "Unable to parse package file %s (2)"
msgstr "無法辨識套件『%s』(1)。"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "開啟『%s』中"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "來源檔『%2$s』第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。"
@@ -2381,7 +2382,7 @@ msgstr "找不到『%spartial』清單目錄。"
msgid "Archive directory %spartial is missing."
msgstr "找不到『%spartial』檔案目錄。"
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2404,12 +2405,12 @@ msgstr ""
" '%s' 的光碟\n"
"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "本軟體不支持『%s』包裝法。"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "無法明白系統類別。"
@@ -2527,31 +2528,31 @@ msgstr "無法寫入來源暫存檔。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:719
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "檔案大小不符合。"