Browse Source

Bring consistency to the use of capitals in programs messages

debian/1.8.y
Christian Perrier 18 years ago
parent
commit
db0db9feab
  1. 2
      apt-inst/contrib/extracttar.cc
  2. 4
      apt-inst/deb/debfile.cc
  3. 18
      apt-inst/deb/dpkgdb.cc
  4. 2
      apt-inst/filelist.cc
  5. 8
      apt-pkg/cdrom.cc
  6. 2
      apt-pkg/contrib/configuration.cc
  7. 2
      apt-pkg/contrib/fileutl.cc
  8. 8
      apt-pkg/depcache.cc
  9. 4
      apt-pkg/indexcopy.cc
  10. 2
      apt-pkg/pkgcache.cc
  11. 8
      apt-pkg/pkgcachegen.cc
  12. 2
      apt-pkg/sourcelist.cc
  13. 2
      cmdline/acqprogress.cc
  14. 34
      cmdline/apt-cache.cc
  15. 26
      cmdline/apt-get.cc
  16. 2
      dselect/update
  17. 14
      ftparchive/apt-ftparchive.cc
  18. 2
      ftparchive/contents.cc
  19. 6
      ftparchive/multicompress.cc
  20. 8
      methods/cdrom.cc
  21. 4
      methods/ftp.cc
  22. 14
      methods/http.cc
  23. 6
      methods/rsh.cc
  24. 157
      po/apt-all.pot

2
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;

4
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;
}
/*}}}*/

18
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)

2
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;

8
apt-pkg/cdrom.cc

@ -535,7 +535,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
}
if(log) {
msg.str("");
ioprintf(msg, _("Stored Label: %s \n"),
ioprintf(msg, _("Stored label: %s \n"),
Database.Find("CD::"+ident).c_str());
log->Update(msg.str());
}
@ -603,7 +603,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
log->Update("["+ID+"]\n");
if(log)
log->Update(_("Scanning Disc for index files..\n"),STEP_SCAN);
log->Update(_("Scanning disc for index files..\n"),STEP_SCAN);
// Get the CD structure
vector<string> List;
@ -714,7 +714,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
Database.Set("CD::" + ID,Name);
if(log) {
msg.str("");
ioprintf(msg, _("This Disc is called: \n'%s'\n"), Name.c_str());
ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str());
log->Update(msg.str());
}
@ -751,7 +751,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
// Print the sourcelist entries
if(log)
log->Update(_("Source List entries for this Disc are:\n"));
log->Update(_("Source list entries for this disc are:\n"));
for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
{

2
apt-pkg/contrib/configuration.cc

@ -583,7 +583,7 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
string Tag;
const char *Pos = LineBuffer.c_str();
if (ParseQuoteWord(Pos,Tag) == false)
return _error->Error(_("Syntax error %s:%u: Malformed Tag"),FName.c_str(),CurLine);
return _error->Error(_("Syntax error %s:%u: Malformed tag"),FName.c_str(),CurLine);
// Parse off the word
string Word;

2
apt-pkg/contrib/fileutl.cc

@ -356,7 +356,7 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap)
if (Reap == true)
return false;
return _error->Error(_("Waited, for %s but it wasn't there"),Name);
return _error->Error(_("Waited for %s but it wasn't there"),Name);
}

8
apt-pkg/depcache.cc

@ -57,8 +57,8 @@ bool pkgDepCache::Init(OpProgress *Prog)
if (Prog != 0)
{
Prog->OverallProgress(0,2*Head().PackageCount,Head().PackageCount,
_("Building Dependency Tree"));
Prog->SubProgress(Head().PackageCount,_("Candidate Versions"));
_("Building dependency tree"));
Prog->SubProgress(Head().PackageCount,_("Candidate versions"));
}
/* Set the current state of everything. In this state all of the
@ -86,8 +86,8 @@ bool pkgDepCache::Init(OpProgress *Prog)
Prog->OverallProgress(Head().PackageCount,2*Head().PackageCount,
Head().PackageCount,
_("Building Dependency Tree"));
Prog->SubProgress(Head().PackageCount,_("Dependency Generation"));
_("Building dependency tree"));
Prog->SubProgress(Head().PackageCount,_("Dependency generation"));
}
Update(Prog);

4
apt-pkg/indexcopy.cc

@ -263,10 +263,10 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
ioprintf(msg, _("Wrote %i records with %i missing files.\n"),
Packages, NotFound);
else if (NotFound == 0 && WrongSize != 0)
ioprintf(msg, _("Wrote %i records with %i mismachted files\n"),
ioprintf(msg, _("Wrote %i records with %i mismatched files\n"),
Packages, WrongSize);
if (NotFound != 0 && WrongSize != 0)
ioprintf(msg, _("Wrote %i records with %i missing files and %i mismachted files\n"), Packages, NotFound, WrongSize);
ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
}
if (Packages == 0)

2
apt-pkg/pkgcache.cc

@ -139,7 +139,7 @@ bool pkgCache::ReMap()
// Locate our VS..
if (HeaderP->VerSysName == 0 ||
(VS = pkgVersioningSystem::GetVS(StrP + HeaderP->VerSysName)) == 0)
return _error->Error(_("This APT does not support the Versioning System '%s'"),StrP + HeaderP->VerSysName);
return _error->Error(_("This APT does not support the versioning system '%s'"),StrP + HeaderP->VerSysName);
// Chcek the arhcitecture
if (HeaderP->Architecture == 0 ||

8
apt-pkg/pkgcachegen.cc

@ -640,7 +640,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
}
unsigned long Size = (*I)->Size();
Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading Package Lists"));
Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists"));
CurrentSize += Size;
if ((*I)->Merge(Gen,Progress) == false)
@ -709,12 +709,12 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
Progress.OverallProgress(0,1,1,_("Reading Package Lists"));
Progress.OverallProgress(0,1,1,_("Reading package lists"));
// Cache is OK, Fin.
if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true)
{
Progress.OverallProgress(1,1,1,_("Reading Package Lists"));
Progress.OverallProgress(1,1,1,_("Reading package lists"));
return true;
}
@ -837,7 +837,7 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
// Build the status cache
Progress.OverallProgress(0,1,1,_("Reading Package Lists"));
Progress.OverallProgress(0,1,1,_("Reading package lists"));
pkgCacheGenerator Gen(Map.Get(),&Progress);
if (_error->PendingError() == true)
return false;

2
apt-pkg/sourcelist.cc

@ -95,7 +95,7 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
{
if (ParseQuoteWord(Buffer,Section) == true)
return _error->Error(_("Malformed line %lu in source list %s (Absolute dist)"),CurLine,File.c_str());
return _error->Error(_("Malformed line %lu in source list %s (absolute dist)"),CurLine,File.c_str());
Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
return CreateItem(List,URI,Dist,Section);
}

2
cmdline/acqprogress.cc

@ -268,7 +268,7 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
{
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
ioprintf(cout,_("Media Change: Please insert the disc labeled\n"
ioprintf(cout,_("Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"),
Media.c_str(),Drive.c_str());

34
cmdline/apt-cache.cc

@ -229,7 +229,7 @@ bool DumpPackage(CommandLine &CmdL)
bool Stats(CommandLine &Cmd)
{
pkgCache &Cache = *GCache;
cout << _("Total Package Names : ") << Cache.Head().PackageCount << " (" <<
cout << _("Total package names : ") << Cache.Head().PackageCount << " (" <<
SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl;
int Normal = 0;
@ -269,20 +269,20 @@ bool Stats(CommandLine &Cmd)
continue;
}
}
cout << _(" Normal Packages: ") << Normal << endl;
cout << _(" Pure Virtual Packages: ") << Virtual << endl;
cout << _(" Single Virtual Packages: ") << DVirt << endl;
cout << _(" Mixed Virtual Packages: ") << NVirt << endl;
cout << _(" Normal packages: ") << Normal << endl;
cout << _(" Pure virtual packages: ") << Virtual << endl;
cout << _(" Single virtual packages: ") << DVirt << endl;
cout << _(" Mixed virtual packages: ") << NVirt << endl;
cout << _(" Missing: ") << Missing << endl;
cout << _("Total Distinct Versions: ") << Cache.Head().VersionCount << " (" <<
cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" <<
SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl;
cout << _("Total Dependencies: ") << Cache.Head().DependsCount << " (" <<
cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" <<
SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
cout << _("Total Ver/File relations: ") << Cache.Head().VerFileCount << " (" <<
cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" <<
SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl;
cout << _("Total Provides Mappings: ") << Cache.Head().ProvidesCount << " (" <<
cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" <<
SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl;
// String list stats
@ -294,7 +294,7 @@ bool Stats(CommandLine &Cmd)
Count++;
Size += strlen(Cache.StrP + I->String) + 1;
}
cout << _("Total Globbed Strings: ") << Count << " (" << SizeToStr(Size) << ')' << endl;
cout << _("Total globbed strings: ") << Count << " (" << SizeToStr(Size) << ')' << endl;
unsigned long DepVerSize = 0;
for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
@ -308,12 +308,12 @@ bool Stats(CommandLine &Cmd)
}
}
}
cout << _("Total Dependency Version space: ") << SizeToStr(DepVerSize) << endl;
cout << _("Total dependency version space: ") << SizeToStr(DepVerSize) << endl;
unsigned long Slack = 0;
for (int I = 0; I != 7; I++)
Slack += Cache.Head().Pools[I].ItemSize*Cache.Head().Pools[I].Count;
cout << _("Total Slack space: ") << SizeToStr(Slack) << endl;
cout << _("Total slack space: ") << SizeToStr(Slack) << endl;
unsigned long Total = 0;
Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz +
@ -321,7 +321,7 @@ bool Stats(CommandLine &Cmd)
Cache.Head().PackageCount*Cache.Head().PackageSz +
Cache.Head().VerFileCount*Cache.Head().VerFileSz +
Cache.Head().ProvidesCount*Cache.Head().ProvidesSz;
cout << _("Total Space Accounted for: ") << SizeToStr(Total) << endl;
cout << _("Total space accounted for: ") << SizeToStr(Total) << endl;
return true;
}
@ -1459,7 +1459,7 @@ bool Policy(CommandLine &CmdL)
// Print out all of the package files
if (CmdL.FileList[1] == 0)
{
cout << _("Package Files:") << endl;
cout << _("Package files:") << endl;
for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++)
{
// Locate the associated index files so we can derive a description
@ -1479,7 +1479,7 @@ bool Policy(CommandLine &CmdL)
}
// Show any packages have explicit pins
cout << _("Pinned Packages:") << endl;
cout << _("Pinned packages:") << endl;
pkgCache::PkgIterator I = Cache.PkgBegin();
for (;I.end() != true; I++)
{
@ -1529,7 +1529,7 @@ bool Policy(CommandLine &CmdL)
// Pinned version
if (Plcy.GetPriority(Pkg) != 0)
{
cout << _(" Package Pin: ");
cout << _(" Package pin: ");
V = Plcy.GetMatch(Pkg);
if (V.end() == true)
cout << _("(not found)") << endl;
@ -1538,7 +1538,7 @@ bool Policy(CommandLine &CmdL)
}
// Show the priority tables
cout << _(" Version Table:") << endl;
cout << _(" Version table:") << endl;
for (V = Pkg.VersionList(); V.end() == false; V++)
{
if (Pkg.CurrentVer() == V)

26
cmdline/apt-get.cc

@ -631,7 +631,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
// Check that the system is OK
if (DCache->DelCount() != 0 || DCache->InstCount() != 0)
return _error->Error("Internal Error, non-zero counts");
return _error->Error("Internal error, non-zero counts");
// Apply corrections for half-installed packages
if (pkgApplyStatus(*DCache) == false)
@ -695,7 +695,7 @@ static bool CheckAuth(pkgAcquire& Fetcher)
if (_config->FindI("quiet",0) < 2
&& _config->FindB("APT::Get::Assume-Yes",false) == false)
{
c2out << _("Install these packages without verification? [y/N] ") << flush;
c2out << _("Install these packages without verification [y/N]? ") << flush;
if (!YnPrompt(false))
return _error->Error(_("Some packages could not be authenticated"));
@ -750,7 +750,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (Cache->BrokenCount() != 0)
{
ShowBroken(c1out,Cache,false);
return _error->Error("Internal Error, InstallPackages was called with broken packages!");
return _error->Error("Internal error, InstallPackages was called with broken packages!");
}
if (Cache->DelCount() == 0 && Cache->InstCount() == 0 &&
@ -759,7 +759,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
// No remove flag
if (Cache->DelCount() != 0 && _config->FindB("APT::Get::Remove",true) == false)
return _error->Error(_("Packages need to be removed but Remove is disabled."));
return _error->Error(_("Packages need to be removed but remove is disabled."));
// Run the simulator ..
if (_config->FindB("APT::Get::Simulate") == true)
@ -769,7 +769,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (Res == pkgPackageManager::Failed)
return false;
if (Res != pkgPackageManager::Completed)
return _error->Error("Internal Error, Ordering didn't finish");
return _error->Error("Internal error, Ordering didn't finish");
return true;
}
@ -883,7 +883,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (_config->FindI("quiet",0) < 2 &&
_config->FindB("APT::Get::Assume-Yes",false) == false)
{
c2out << _("Do you want to continue? [Y/n] ") << flush;
c2out << _("Do you want to continue [Y/n]? ") << flush;
if (YnPrompt() == false)
{
@ -990,7 +990,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
if (Failed == true && PM->FixMissing() == false)
{
cerr << _("Unable to correct missing packages.") << endl;
return _error->Error(_("Aborting Install."));
return _error->Error(_("Aborting install."));
}
_system->UnLock();
@ -1369,7 +1369,7 @@ bool DoUpgrade(CommandLine &CmdL)
if (pkgAllUpgrade(Cache) == false)
{
ShowBroken(c1out,Cache,false);
return _error->Error(_("Internal Error, AllUpgrade broke stuff"));
return _error->Error(_("Internal error, AllUpgrade broke stuff"));
}
return InstallPackages(Cache,true);
@ -1661,7 +1661,7 @@ bool DoDistUpgrade(CommandLine &CmdL)
if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
return false;
c0out << _("Calculating Upgrade... ") << flush;
c0out << _("Calculating upgrade... ") << flush;
if (pkgDistUpgrade(*Cache) == false)
{
c0out << _("Failed") << endl;
@ -1734,7 +1734,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (Fix.Resolve() == false)
{
ShowBroken(c1out,Cache,false);
return _error->Error("Internal Error, problem resolver broke stuff");
return _error->Error("Internal error, problem resolver broke stuff");
}
}
@ -1742,7 +1742,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
if (pkgAllUpgrade(Cache) == false)
{
ShowBroken(c1out,Cache,false);
return _error->Error("Internal Error, problem resolver broke stuff");
return _error->Error("Internal error, problem resolver broke stuff");
}
return InstallPackages(Cache,false);
@ -1930,7 +1930,7 @@ bool DoSource(CommandLine &CmdL)
if (_config->FindB("APT::Get::Simulate",false) == true)
{
for (unsigned I = 0; I != J; I++)
ioprintf(cout,_("Fetch Source %s\n"),Dsc[I].Package.c_str());
ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
return true;
}
@ -2315,7 +2315,7 @@ bool ShowHelp(CommandLine &CmdL)
if (_config->FindB("version") == true)
{
cout << _("Supported Modules:") << endl;
cout << _("Supported modules:") << endl;
for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
{

2
dselect/update

@ -27,7 +27,7 @@ CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
STATUS=1
if $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" update
then
echo $"Merging Available information"
echo $"Merging available information"
rm -f $CACHEDIR/available
$APTCACHE dumpavail > $CACHEDIR/available
$DPKG "$DPKG_OPTS" --update-avail $CACHEDIR/available

14
ftparchive/apt-ftparchive.cc

@ -162,7 +162,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
if (PkgExt.empty() == false && Packages.SetExts(PkgExt) == false)
return _error->Error(_("Package extension list is too long"));
if (_error->PendingError() == true)
return _error->Error(_("Error Processing directory %s"),BaseDir.c_str());
return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
Packages.PathPrefix = PathPrefix;
Packages.DirStrip = ArchiveDir;
@ -176,7 +176,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
PkgCompress,Permissions);
Packages.Output = Comp.Input;
if (_error->PendingError() == true)
return _error->Error(_("Error Processing directory %s"),BaseDir.c_str());
return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
c0out << ' ' << BaseDir << ":" << flush;
@ -199,7 +199,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
if (Comp.Finalize(Size) == false)
{
c0out << endl;
return _error->Error(_("Error Processing directory %s"),BaseDir.c_str());
return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
}
if (Size != 0)
@ -249,7 +249,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
if (SrcExt.empty() == false && Sources.SetExts(SrcExt) == false)
return _error->Error(_("Source extension list is too long"));
if (_error->PendingError() == true)
return _error->Error(_("Error Processing directory %s"),BaseDir.c_str());
return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
Sources.PathPrefix = PathPrefix;
Sources.DirStrip = ArchiveDir;
@ -263,7 +263,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
SrcCompress,Permissions);
Sources.Output = Comp.Input;
if (_error->PendingError() == true)
return _error->Error(_("Error Processing directory %s"),BaseDir.c_str());
return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
c0out << ' ' << BaseDir << ":" << flush;
@ -285,7 +285,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
if (Comp.Finalize(Size) == false)
{
c0out << endl;
return _error->Error(_("Error Processing directory %s"),BaseDir.c_str());
return _error->Error(_("Error processing directory %s"),BaseDir.c_str());
}
if (Size != 0)
@ -394,7 +394,7 @@ bool PackageMap::GenContents(Configuration &Setup,
if (Comp.Finalize(Size) == false || _error->PendingError() == true)
{
c0out << endl;
return _error->Error(_("Error Processing Contents %s"),
return _error->Error(_("Error processing contents %s"),
this->Contents.c_str());
}

2
ftparchive/contents.cc

@ -314,7 +314,7 @@ bool ContentsExtract::Read(debDebFile &Deb)
Compressor = "bzip2";
}
if (Member == 0) {
_error->Error(_("Internal Error, could not locate member %s"),"data.tar.gz");
_error->Error(_("Internal error, could not locate member %s"),"data.tar.gz");
return false;
}

6
ftparchive/multicompress.cc

@ -72,7 +72,7 @@ MultiCompress::MultiCompress(string Output,string Compress,
// Hmm.. unknown.
if (Comp->Name == 0)
{
_error->Warning(_("Unknown Compresison Algorithm '%s'"),string(Start,I).c_str());
_error->Warning(_("Unknown compression algorithm '%s'"),string(Start,I).c_str());
continue;
}
@ -212,7 +212,7 @@ bool MultiCompress::Die()
fclose(Input);
Input = 0;
bool Res = ExecWait(Outputter,_("Compress Child"),false);
bool Res = ExecWait(Outputter,_("Compress child"),false);
Outputter = -1;
return Res;
}
@ -235,7 +235,7 @@ bool MultiCompress::Finalize(unsigned long &OutSize)
{
struct stat St;
if (stat(I->Output.c_str(),&St) != 0)
return _error->Error(_("Internal Error, Failed to create %s"),
return _error->Error(_("Internal error, failed to create %s"),
I->Output.c_str());
if (I->OldMTime != St.st_mtime)

8
methods/cdrom.cc

@ -119,15 +119,15 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
// All non IMS queries for package files fail.
if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)
{
Fail(_("Please use apt-cdrom to make this CD recognized by APT."
" apt-get update cannot be used to add new CDs"));
Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT."
" apt-get update cannot be used to add new CD-ROMs"));
return true;
}
// We already have a CD inserted, but it is the wrong one
if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
{
Fail(_("Wrong CD"),true);
Fail(_("Wrong CD-ROM"),true);
return true;
}
@ -165,7 +165,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";
Fail(_("Wrong CD"),true);
Fail(_("Wrong CD-ROM"),true);
return true;
}
}

4
methods/ftp.cc

@ -201,7 +201,7 @@ bool FTPConn::Login()
if (ReadResp(Tag,Msg) == false)
return false;
if (Tag >= 400)
return _error->Error(_("Server refused our connection and said: %s"),Msg.c_str());
return _error->Error(_("The server refused the connection and said: %s"),Msg.c_str());
// Send the user
if (WriteMsg(Tag,Msg,"USER %s",User.c_str()) == false)
@ -443,7 +443,7 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
int Res = write(ServerFd,S + Start,Len);
if (Res <= 0)
{
_error->Errno("write",_("Write Error"));
_error->Errno("write",_("Write error"));
Close();
return false;
}

14
methods/http.cc

@ -514,14 +514,14 @@ bool ServerState::HeaderLine(string Line)
{
if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor,
&Result,Code) != 4)
return _error->Error(_("The http server sent an invalid reply header"));
return _error->Error(_("The HTTP server sent an invalid reply header"));
}
else
{
Major = 0;
Minor = 9;
if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2)
return _error->Error(_("The http server sent an invalid reply header"));
return _error->Error(_("The HTTP server sent an invalid reply header"));
}
/* Check the HTTP response header to get the default persistance
@ -550,7 +550,7 @@ bool ServerState::HeaderLine(string Line)
return true;
if (sscanf(Val.c_str(),"%lu",&Size) != 1)
return _error->Error(_("The http server sent an invalid Content-Length header"));
return _error->Error(_("The HTTP server sent an invalid Content-Length header"));
return true;
}
@ -565,9 +565,9 @@ bool ServerState::HeaderLine(string Line)
HaveContent = true;
if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)
return _error->Error(_("The http server sent an invalid Content-Range header"));
return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
if ((unsigned)StartPos > Size)
return _error->Error(_("This http server has broken range support"));
return _error->Error(_("This HTTP server has broken range support"));
return true;
}
@ -829,7 +829,7 @@ bool HttpMethod::ServerDie(ServerState *Srv)
{
Srv->Close();
if (LErrno == 0)
return _error->Error(_("Error reading from server Remote end closed connection"));
return _error->Error(_("Error reading from server. Remote end closed connection"));
errno = LErrno;
return _error->Errno("read",_("Error reading from server"));
}
@ -1062,7 +1062,7 @@ int HttpMethod::Loop()
// The header data is bad
case 2:
{
_error->Error(_("Bad header Data"));
_error->Error(_("Bad header data"));
Fail(true);
RotateDNS();
continue;

6
methods/rsh.cc

@ -229,7 +229,7 @@ bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...)
int Res = write(WriteFd,S + Start,Len);
if (Res <= 0)
{
_error->Errno("write",_("Write Error"));
_error->Errno("write",_("Write error"));
Close();
return false;
}
@ -261,7 +261,7 @@ bool RSHConn::Size(const char *Path,unsigned long &Size)
char *End;
Size = strtoul(Msg.c_str(),&End,10);
if (End == Msg.c_str())
return _error->Error(_("File Not Found"));
return _error->Error(_("File not found"));
return true;
}
/*}}}*/
@ -430,7 +430,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
Server->ModTime(File,FailTime) == false)
{
//Fail(true);
//_error->Error(_("File Not Found")); // Will be handled by Size
//_error->Error(_("File not found")); // Will be handled by Size
return false;
}
Res.Size = Size;

157
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-03-05 12:06+0100\n"
"POT-Creation-Date: 2005-03-06 12:50+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"
@ -28,23 +28,23 @@ msgid "Unable to locate package %s"
msgstr ""
#: cmdline/apt-cache.cc:232
msgid "Total Package Names : "
msgid "Total package names : "
msgstr ""
#: cmdline/apt-cache.cc:272
msgid " Normal Packages: "
msgid " Normal packages: "
msgstr ""
#: cmdline/apt-cache.cc:273
msgid " Pure Virtual Packages: "
msgid " Pure virtual packages: "
msgstr ""
#: cmdline/apt-cache.cc:274
msgid " Single Virtual Packages: "
msgid " Single virtual packages: "
msgstr ""
#: cmdline/apt-cache.cc:275
msgid " Mixed Virtual Packages: "
msgid " Mixed virtual packages: "
msgstr ""
#: cmdline/apt-cache.cc:276
@ -52,35 +52,35 @@ msgid " Missing: "
msgstr ""
#: cmdline/apt-cache.cc:278
msgid "Total Distinct Versions: "
msgid "Total distinct versions: "
msgstr ""
#: cmdline/apt-cache.cc:280
msgid "Total Dependencies: "
msgid "Total dependencies: "
msgstr ""
#: cmdline/apt-cache.cc:283
msgid "Total Ver/File relations: "
msgid "Total ver/file relations: "
msgstr ""
#: cmdline/apt-cache.cc:285
msgid "Total Provides Mappings: "
msgid "Total Provides mappings: "
msgstr ""
#: cmdline/apt-cache.cc:297
msgid "Total Globbed Strings: "
msgid "Total globbed strings: "
msgstr ""
#: cmdline/apt-cache.cc:311
msgid "Total Dependency Version space: "
msgid "Total dependency version space: "
msgstr ""
#: cmdline/apt-cache.cc:316
msgid "Total Slack space: "
msgid "Total slack space: "
msgstr ""
#: cmdline/apt-cache.cc:324
msgid "Total Space Accounted for: "
msgid "Total space accounted for: "
msgstr ""
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
@ -97,7 +97,7 @@ msgid "No packages found"
msgstr ""
#: cmdline/apt-cache.cc:1462
msgid "Package Files:"
msgid "Package files:"
msgstr ""
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
@ -111,7 +111,7 @@ msgstr ""
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
msgid "Pinned Packages:"
msgid "Pinned packages:"
msgstr ""
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
@ -133,12 +133,12 @@ msgid " Candidate: "
msgstr ""
#: cmdline/apt-cache.cc:1532
msgid " Package Pin: "
msgid " Package pin: "
msgstr ""
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
msgid " Version Table:"
msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1556
@ -248,7 +248,7 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
#, c-format
msgid "Error Processing directory %s"
msgid "Error processing directory %s"
msgstr ""
#: ftparchive/apt-ftparchive.cc:250
@ -261,7 +261,7 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:397
#, c-format
msgid "Error Processing Contents %s"
msgid "Error processing contents %s"
msgstr ""
#: ftparchive/apt-ftparchive.cc:551
@ -426,7 +426,7 @@ msgstr ""
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal Error, could not locate member %s"
msgid "Internal error, could not locate member %s"
msgstr ""
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
@ -460,7 +460,7 @@ msgstr ""
#: ftparchive/multicompress.cc:75
#, c-format
msgid "Unknown Compresison Algorithm '%s'"
msgid "Unknown compression algorithm '%s'"
msgstr ""
#: ftparchive/multicompress.cc:105
@ -481,12 +481,12 @@ msgid "Failed to fork"
msgstr ""
#: ftparchive/multicompress.cc:215
msgid "Compress Child"
msgid "Compress child"
msgstr ""
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal Error, Failed to create %s"
msgid "Internal error, failed to create %s"
msgstr ""
#: ftparchive/multicompress.cc:289
@ -655,7 +655,7 @@ msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
#: cmdline/apt-get.cc:698
msgid "Install these packages without verification? [y/N] "
msgid "Install these packages without verification [y/N]? "
msgstr ""
#: cmdline/apt-get.cc:700
@ -667,7 +667,7 @@ msgid "There are problems and -y was used without --force-yes"
msgstr ""
#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but Remove is disabled."
msgid "Packages need to be removed but remove is disabled."
msgstr ""
#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
@ -725,7 +725,7 @@ msgid "Abort."
msgstr ""
#: cmdline/apt-get.cc:886
msgid "Do you want to continue? [Y/n] "
msgid "Do you want to continue [Y/n]? "
msgstr ""
#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
@ -756,7 +756,7 @@ msgid "Unable to correct missing packages."
msgstr ""
#: cmdline/apt-get.cc:993
msgid "Aborting Install."
msgid "Aborting install."
msgstr ""
#: cmdline/apt-get.cc:1026
@ -844,7 +844,7 @@ msgid ""
msgstr ""
#: cmdline/apt-get.cc:1372
msgid "Internal Error, AllUpgrade broke stuff"
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
@ -903,7 +903,7 @@ msgid "Recommended packages:"
msgstr ""
#: cmdline/apt-get.cc:1664
msgid "Calculating Upgrade... "
msgid "Calculating upgrade... "
msgstr ""
#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
@ -940,7 +940,7 @@ msgstr ""
#: cmdline/apt-get.cc:1933
#, c-format
msgid "Fetch Source %s\n"
msgid "Fetch source %s\n"
msgstr ""
#: cmdline/apt-get.cc:1964
@ -1014,7 +1014,7 @@ msgid "Failed to process build dependencies"
msgstr ""
#: cmdline/apt-get.cc:2318
msgid "Supported Modules:"
msgid "Supported modules:"
msgstr ""
#: cmdline/apt-get.cc:2359
@ -1088,7 +1088,7 @@ msgstr ""
#: cmdline/acqprogress.cc:271
#, c-format
msgid ""
"Media Change: Please insert the disc labeled\n"
"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
@ -1138,7 +1138,7 @@ msgid ""
msgstr ""
#: dselect/update:30
msgid "Merging Available information"
msgid "Merging available information"
msgstr ""
#: apt-inst/contrib/extracttar.cc:117
@ -1154,7 +1154,7 @@ msgid "Corrupted archive"
msgstr ""
#: apt-inst/contrib/extracttar.cc:195
msgid "Tar Checksum failed, archive corrupted"
msgid "Tar checksum failed, archive corrupted"
msgstr ""
#: apt-inst/contrib/extracttar.cc:298
@ -1195,7 +1195,7 @@ msgid "Failed to allocate diversion"
msgstr ""
#: apt-inst/filelist.cc:468
msgid "Internal Error in AddDiversion"
msgid "Internal error in AddDiversion"
msgstr ""
#: apt-inst/filelist.cc:481
@ -1304,7 +1304,7 @@ msgstr ""
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
#: apt-pkg/pkgcachegen.cc:840
msgid "Reading Package Lists"
msgid "Reading package lists"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:180
@ -1314,11 +1314,11 @@ msgstr ""
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal Error getting a Package Name"
msgid "Internal error getting a package name"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:205
msgid "Reading File Listing"
msgid "Reading file listing"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:216
@ -1335,7 +1335,7 @@ msgid "Failed reading the list file %sinfo/%s"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal Error getting a Node"
msgid "Internal error getting a node"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:309
@ -1354,7 +1354,7 @@ msgid "Invalid line in the diversion file: %s"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal Error adding a diversion"
msgid "Internal error adding a diversion"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:383
@ -1362,12 +1362,12 @@ msgid "The pkg cache must be initialize first"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading File List"
msgid "Reading file list"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: Header, offset %lu"
msgid "Failed to find a Package: header, offset %lu"
msgstr ""
#: apt-inst/deb/dpkgdb.cc:465
@ -1396,7 +1396,7 @@ msgid "Couldn't change to %s"
msgstr ""
#: apt-inst/deb/debfile.cc:138
msgid "Internal Error, could not locate member"
msgid "Internal error, could not locate member"
msgstr ""
#: apt-inst/deb/debfile.cc:171
@ -1404,7 +1404,7 @@ msgid "Failed to locate a valid control file"
msgstr ""
#: apt-inst/deb/debfile.cc:256
msgid "Unparsible control file"
msgid "Unparsable control file"
msgstr ""
#: methods/cdrom.cc:113
@ -1414,12 +1414,12 @@ msgstr ""
#: methods/cdrom.cc:122
msgid ""
"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
"cannot be used to add new CDs"
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
#: methods/cdrom.cc:130 methods/cdrom.cc:168
msgid "Wrong CD"
msgid "Wrong CD-ROM"
msgstr ""
#: methods/cdrom.cc:163
@ -1427,7 +1427,7 @@ msgstr ""
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
#: methods/cdrom.cc:177 methods/file.cc:77
#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
msgid "File not found"
msgstr ""
@ -1456,9 +1456,9 @@ msgstr ""
msgid "Unable to determine the local name"
msgstr ""
#: methods/ftp.cc:204 methods/ftp.cc:232
#: methods/ftp.cc:204
#, c-format
msgid "Server refused our connection and said: %s"
msgid "The server refused the connection and said: %s"
msgstr ""
#: methods/ftp.cc:210
@ -1471,6 +1471,11 @@ msgstr ""
msgid "PASS failed, server said: %s"
msgstr ""
#: methods/ftp.cc:232
#, c-format
msgid "Server refused our connection and said: %s"
msgstr ""
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
@ -1507,8 +1512,8 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
#: methods/ftp.cc:446 methods/rsh.cc:232
msgid "Write Error"
#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr ""
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
@ -1669,19 +1674,19 @@ msgid "Bad header line"
msgstr ""
#: methods/http.cc:517 methods/http.cc:524
msgid "The http server sent an invalid reply header"
msgid "The HTTP server sent an invalid reply header"
msgstr ""
#: methods/http.cc:553
msgid "The http server sent an invalid Content-Length header"
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
#: methods/http.cc:568
msgid "The http server sent an invalid Content-Range header"
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
#: methods/http.cc:570
msgid "This http server has broken range support"
msgid "This HTTP server has broken range support"
msgstr ""
#: methods/http.cc:594
@ -1709,7 +1714,7 @@ msgid "Error writing to the file"
msgstr ""
#: methods/http.cc:832
msgid "Error reading from server Remote end closed connection"
msgid "Error reading from server. Remote end closed connection"
msgstr ""
#: methods/http.cc:834
@ -1717,7 +1722,7 @@ msgid "Error reading from server"
msgstr ""
#: methods/http.cc:1065
msgid "Bad header Data"
msgid "Bad header data"
msgstr ""
#: methods/http.cc:1082
@ -1728,10 +1733,6 @@ msgstr ""
msgid "Internal error"
msgstr ""
#: methods/rsh.cc:264
msgid "File Not Found"
msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
@ -1772,7 +1773,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:586
#, c-format
msgid "Syntax error %s:%u: Malformed Tag"
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
#: apt-pkg/contrib/configuration.cc:603
@ -1897,7 +1898,7 @@ msgstr ""
#: apt-pkg/contrib/fileutl.cc:359
#, c-format