diff options
author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 17:51:15 +0000 |
---|---|---|
committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 17:51:15 +0000 |
commit | b81af2c2bb8a4b41b8adbb1c351fbd0964542558 (patch) | |
tree | 43d27059095daf9a1534b26a3b6b8cdb9761796a /apt-inst | |
parent | d73e594e888fbc099bba84726df72eedcee5272c (diff) | |
parent | f71d29c87b24b470fc2ae6b051ceaa8c9faa8358 (diff) |
Merge bubulle@debian.org--2005/apt--main--0
Patches applied:
* 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.cc | 2 | ||||
-rw-r--r-- | apt-inst/deb/debfile.cc | 4 | ||||
-rw-r--r-- | apt-inst/deb/dpkgdb.cc | 18 | ||||
-rw-r--r-- | apt-inst/filelist.cc | 2 |
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; |