summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-03-31 18:35:21 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-03-31 18:35:21 +0000
commit06f02b954f5c4ca7cb9cc288ea5a8fcb6a1052d4 (patch)
treec13a240d862ab3f62121062d4961b75a63d01e97 /apt-inst
parent89eaeb446c24bbeacc5f69c170cf60104854432e (diff)
parent0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff)
* merged with matts tree
Patches applied: * apt@packages.debian.org/apt--main--0--patch-72 Open 0.6.36 * apt@packages.debian.org/apt--main--0--patch-73 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-74 Update changelog * apt@packages.debian.org/apt--main--0--patch-75 Merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-76 Update changelog * bubulle@debian.org--2005/apt--main--0--patch-58 Correct file permissions * bubulle@debian.org--2005/apt--main--0--patch-59 Bring consistency to the use of capitals in programs messages * bubulle@debian.org--2005/apt--main--0--patch-60 Correct the permission change on configure.in * bubulle@debian.org--2005/apt--main--0--patch-61 Complete unfuzzification of PO files after the capitalization fixes * bubulle@debian.org--2005/apt--main--0--patch-62 Final work of capitalization cleaning and translation unfuzzyfication * bubulle@debian.org--2005/apt--main--0--patch-63 Correct the "arbitary" typo in apt-ftparchive * bubulle@debian.org--2005/apt--main--0--patch-64 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-65 Italian translation update
Diffstat (limited to 'apt-inst')
-rw-r--r--apt-inst/contrib/extracttar.cc2
-rw-r--r--apt-inst/deb/debfile.cc4
-rw-r--r--apt-inst/deb/dpkgdb.cc18
-rw-r--r--apt-inst/filelist.cc2
4 files changed, 13 insertions, 13 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 4c29757ab..2585986d7 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -192,7 +192,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
return Done(true);
if (NewSum != CheckSum)
- return _error->Error(_("Tar Checksum failed, archive corrupted"));
+ return _error->Error(_("Tar checksum failed, archive corrupted"));
// Decode all of the fields
pkgDirStream::Item Itm;
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index fe2130677..84906ff56 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -135,7 +135,7 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
Compressor = "bzip2";
}
if (Member == 0)
- return _error->Error(_("Internal Error, could not locate member"));
+ return _error->Error(_("Internal error, could not locate member"));
if (File.Seek(Member->Start) == false)
return false;
@@ -253,7 +253,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
Control[Length] = '\n';
Control[Length+1] = '\n';
if (Section.Scan(Control,Length+2) == false)
- return _error->Error(_("Unparsible control file"));
+ return _error->Error(_("Unparsable control file"));
return true;
}
/*}}}*/
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index 7da5a26aa..de781f44c 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -136,7 +136,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
{
if (Cache != 0)
{
- Progress.OverallProgress(1,1,1,_("Reading Package Lists"));
+ Progress.OverallProgress(1,1,1,_("Reading package lists"));
return true;
}
@@ -198,11 +198,11 @@ bool debDpkgDB::ReadFList(OpProgress &Progress)
pkgFLCache::PkgIterator FlPkg = FList->GetPkg(I.Name(),0,true);
if (FlPkg.end() == true)
{
- _error->Error(_("Internal Error getting a Package Name"));
+ _error->Error(_("Internal error getting a package name"));
break;
}
- Progress.OverallProgress(Count,Total,1,_("Reading File Listing"));
+ Progress.OverallProgress(Count,Total,1,_("Reading file listing"));
// Open the list file
snprintf(Name,sizeof(Name),"%s.list",I.Name());
@@ -263,7 +263,7 @@ bool debDpkgDB::ReadFList(OpProgress &Progress)
FlPkg.Offset(),true,false);
if (Node.end() == true)
{
- _error->Error(_("Internal Error getting a Node"));
+ _error->Error(_("Internal error getting a node"));
break;
}
}
@@ -352,14 +352,14 @@ bool debDpkgDB::ReadDiversions()
pkgFLCache::PkgIterator FlPkg = FList->GetPkg(Package,0,true);
if (FlPkg.end() == true)
{
- _error->Error(_("Internal Error getting a Package Name"));
+ _error->Error(_("Internal error getting a package name"));
break;
}
// Install the diversion
if (FList->AddDiversion(FlPkg,From,To) == false)
{
- _error->Error(_("Internal Error adding a diversion"));
+ _error->Error(_("Internal error adding a diversion"));
break;
}
}
@@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress)
return _error->Error(_("The pkg cache must be initialize first"));
if (FList != 0)
{
- Progress.OverallProgress(1,1,1,_("Reading File List"));
+ Progress.OverallProgress(1,1,1,_("Reading file list"));
return true;
}
@@ -440,12 +440,12 @@ bool debDpkgDB::ReadConfFiles()
const char *PkgStart;
const char *PkgEnd;
if (Section.Find("Package",PkgStart,PkgEnd) == false)
- return _error->Error(_("Failed to find a Package: Header, offset %lu"),Offset);
+ return _error->Error(_("Failed to find a Package: header, offset %lu"),Offset);
// Snag a package record for it
pkgFLCache::PkgIterator FlPkg = FList->GetPkg(PkgStart,PkgEnd,true);
if (FlPkg.end() == true)
- return _error->Error(_("Internal Error getting a Package Name"));
+ return _error->Error(_("Internal error getting a package name"));
// Parse the conf file lines
while (1)
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index 442dcdf06..f14c6416e 100644
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -465,7 +465,7 @@ bool pkgFLCache::AddDiversion(PkgIterator const &Owner,
// Should never happen
if ((FromN->Flags & Node::Diversion) != Node::Diversion ||
(ToN->Flags & Node::Diversion) != Node::Diversion)
- return _error->Error(_("Internal Error in AddDiversion"));
+ return _error->Error(_("Internal error in AddDiversion"));
// Now, try to reclaim an existing diversion..
map_ptrloc Diver = 0;