Package: apt
Version: 0.5.28.4
Severity: minor
Tags: patch
The messages displayed by ATP lack consistency in the use of capitals. Some
messages make a too much wide use of capitals ("Reading Package Lists")
which is incorrect in English.
The attached patch applies to what I currently know of APT 0.6 development
sources and corrects all these messages to only use an initial capital letter.
Please note that applying this patch blindly will break all existing
translations. The attached fixpo.sh script is a very crude script intended
to fix the translations in po/. It assumes that translators have been
consistent in their use of capitals and just preventively unfuzzies the
strings in the PO files.
I however recommend to not use fixpo.sh blindly. Besides being an horror in
terms of CPU usage, it may be not enough for fixing everything. So if the
decision to apply this patch is made, I propose to handle the transition.
What I need currently is an ACK that this proposed patch is OK to be applied or
not on sources....so that I know what to do on translations.
This is why I haven't applied it yet on my arch repository.
-- Package-specific info:
-- /etc/apt/preferences --
Package: *
Pin: release a=experimental
Pin-Priority: 400
-- (/etc/apt/sources.list present, but not submitted) --
-- System Information:
Debian Release: 3.1
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.9-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to fr_FR.UTF-8)
Versions of packages apt depends on:
ii libc6 2.3.2.ds1-20 GNU C Library: Shared libraries an
ii libgcc1 1:3.4.3-9 GCC support library
ii libstdc++5 1:3.3.5-8 The GNU Standard C++ Library v3
-- no debconf information
diff -Nru apt-main/apt-inst/contrib/extracttar.cc apt-main.new/apt-inst/contrib/extracttar.cc
--- apt-main/apt-inst/contrib/extracttar.cc 2005-02-21 10:08:53.491194447 +0100
+++ apt-main.new/apt-inst/contrib/extracttar.cc 2005-02-21 10:07:51.179302708 +0100
@@ -192,7 +192,7 @@
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 -Nru apt-main/apt-inst/deb/debfile.cc apt-main.new/apt-inst/deb/debfile.cc
--- apt-main/apt-inst/deb/debfile.cc 2005-02-21 10:08:53.493194219 +0100
+++ apt-main.new/apt-inst/deb/debfile.cc 2005-02-21 10:07:51.181302479 +0100
@@ -135,7 +135,7 @@
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 @@
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 -Nru apt-main/apt-inst/deb/dpkgdb.cc apt-main.new/apt-inst/deb/dpkgdb.cc
--- apt-main/apt-inst/deb/dpkgdb.cc 2005-02-21 10:08:53.494194104 +0100
+++ apt-main.new/apt-inst/deb/dpkgdb.cc 2005-02-21 10:07:51.215298601 +0100
@@ -136,7 +136,7 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
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 -Nru apt-main/apt-inst/filelist.cc apt-main.new/apt-inst/filelist.cc
--- apt-main/apt-inst/filelist.cc 2005-02-21 10:08:53.502193192 +0100
+++ apt-main.new/apt-inst/filelist.cc 2005-02-21 10:07:51.241295636 +0100
@@ -465,7 +465,7 @@
// 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;
diff -Nru apt-main/apt-pkg/cdrom.cc apt-main.new/apt-pkg/cdrom.cc
--- apt-main/apt-pkg/cdrom.cc 2005-02-21 10:08:43.331353436 +0100
+++ apt-main.new/apt-pkg/cdrom.cc 2005-02-21 10:07:40.078569029 +0100
@@ -518,7 +518,7 @@
}
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());
}
@@ -586,7 +586,7 @@
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;
@@ -697,7 +697,7 @@
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());
}
@@ -734,7 +734,7 @@
// 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++)
{
diff -Nru apt-main/apt-pkg/contrib/configuration.cc apt-main.new/apt-pkg/contrib/configuration.cc
--- apt-main/apt-pkg/contrib/configuration.cc 2005-02-21 10:08:43.218366325 +0100
+++ apt-main.new/apt-pkg/contrib/configuration.cc 2005-02-21 10:07:39.842595948 +0100
@@ -583,7 +583,7 @@
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;
diff -Nru apt-main/apt-pkg/contrib/fileutl.cc apt-main.new/apt-pkg/contrib/fileutl.cc
--- apt-main/apt-pkg/contrib/fileutl.cc 2005-02-21 10:08:43.200368378 +0100
+++ apt-main.new/apt-pkg/contrib/fileutl.cc 2005-02-21 10:07:39.805600169 +0100
@@ -356,7 +356,7 @@
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);
}
diff -Nru apt-main/apt-pkg/depcache.cc apt-main.new/apt-pkg/depcache.cc
--- apt-main/apt-pkg/depcache.cc 2005-02-21 10:08:43.288358340 +0100
+++ apt-main.new/apt-pkg/depcache.cc 2005-02-21 10:07:39.974580892 +0100
@@ -57,8 +57,8 @@
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 @@
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);
diff -Nru apt-main/apt-pkg/indexcopy.cc apt-main.new/apt-pkg/indexcopy.cc
--- apt-main/apt-pkg/indexcopy.cc 2005-02-21 10:08:43.329353664 +0100
+++ apt-main.new/apt-pkg/indexcopy.cc 2005-02-21 10:07:40.077569144 +0100
@@ -263,10 +263,10 @@
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)
diff -Nru apt-main/apt-pkg/pkgcache.cc apt-main.new/apt-pkg/pkgcache.cc
--- apt-main/apt-pkg/pkgcache.cc 2005-02-21 10:08:43.220366097 +0100
+++ apt-main.new/apt-pkg/pkgcache.cc 2005-02-21 10:07:39.851594922 +0100
@@ -139,7 +139,7 @@
// 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 ||
diff -Nru apt-main/apt-pkg/pkgcachegen.cc apt-main.new/apt-pkg/pkgcachegen.cc
--- apt-main/apt-pkg/pkgcachegen.cc 2005-02-21 10:08:43.322354462 +0100
+++ apt-main.new/apt-pkg/pkgcachegen.cc 2005-02-21 10:07:40.056571539 +0100
@@ -640,7 +640,7 @@
}
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 @@
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 @@
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;
diff -Nru apt-main/apt-pkg/sourcelist.cc apt-main.new/apt-pkg/sourcelist.cc
--- apt-main/apt-pkg/sourcelist.cc 2005-02-21 10:08:43.324354234 +0100
+++ apt-main.new/apt-pkg/sourcelist.cc 2005-02-21 10:07:40.059571197 +0100
@@ -95,7 +95,7 @@
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);
}
diff -Nru apt-main/cmdline/acqprogress.cc apt-main.new/cmdline/acqprogress.cc
--- apt-main/cmdline/acqprogress.cc 2005-02-21 10:08:51.531418009 +0100
+++ apt-main.new/cmdline/acqprogress.cc 2005-02-21 10:07:48.959555926 +0100
@@ -268,7 +268,7 @@
{
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());
diff -Nru apt-main/cmdline/apt-cache.cc apt-main.new/cmdline/apt-cache.cc
--- apt-main/cmdline/apt-cache.cc 2005-02-21 10:08:51.513420062 +0100
+++ apt-main.new/cmdline/apt-cache.cc 2005-02-21 10:07:48.929559348 +0100
@@ -229,7 +229,7 @@
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 @@
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 @@
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 @@
}
}
}
- 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 @@
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 @@
// 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 @@
}
// 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 @@
// 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 @@
}
// Show the priority tables
- cout << _(" Version Table:") << endl;
+ cout << _(" Version table:") << endl;
for (V = Pkg.VersionList(); V.end() == false; V++)
{
if (Pkg.CurrentVer() == V)
diff -Nru apt-main/cmdline/apt-get.cc apt-main.new/cmdline/apt-get.cc
--- apt-main/cmdline/apt-get.cc 2005-02-21 10:08:51.364437058 +0100
+++ apt-main.new/cmdline/apt-get.cc 2005-02-21 10:07:48.927559576 +0100
@@ -631,7 +631,7 @@
// 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 @@
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 @@
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 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
if (_config->FindB("version") == true)
{
- cout << _("Supported Modules:") << endl;
+ cout << _("Supported modules:") << endl;
for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
{
diff -Nru apt-main/ftparchive/apt-ftparchive.cc apt-main.new/ftparchive/apt-ftparchive.cc
--- apt-main/ftparchive/apt-ftparchive.cc 2005-02-21 10:08:53.528190226 +0100
+++ apt-main.new/ftparchive/apt-ftparchive.cc 2005-02-21 10:07:51.282290959 +0100
@@ -162,7 +162,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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());
}
diff -Nru apt-main/ftparchive/contents.cc apt-main.new/ftparchive/contents.cc
--- apt-main/ftparchive/contents.cc 2005-02-21 10:08:53.524190683 +0100
+++ apt-main.new/ftparchive/contents.cc 2005-02-21 10:07:51.266292784 +0100
@@ -314,7 +314,7 @@
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;
}
diff -Nru apt-main/ftparchive/multicompress.cc apt-main.new/ftparchive/multicompress.cc
--- apt-main/ftparchive/multicompress.cc 2005-02-21 10:08:53.525190569 +0100
+++ apt-main.new/ftparchive/multicompress.cc 2005-02-21 10:07:51.268292556 +0100
@@ -72,7 +72,7 @@
// 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 @@
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 @@
{
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)
diff -Nru apt-main/methods/cdrom.cc apt-main.new/methods/cdrom.cc
--- apt-main/methods/cdrom.cc 2005-02-21 10:08:51.611408884 +0100
+++ apt-main.new/methods/cdrom.cc 2005-02-21 10:07:49.095540414 +0100
@@ -119,15 +119,15 @@
// 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 @@
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";
- Fail(_("Wrong CD"),true);
+ Fail(_("Wrong CD-ROM"),true);
return true;
}
}
diff -Nru apt-main/methods/ftp.cc apt-main.new/methods/ftp.cc
--- apt-main/methods/ftp.cc 2005-02-21 10:08:51.612408770 +0100
+++ apt-main.new/methods/ftp.cc 2005-02-21 10:07:49.096540300 +0100
@@ -201,7 +201,7 @@
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 @@
int Res = write(ServerFd,S + Start,Len);
if (Res <= 0)
{
- _error->Errno("write",_("Write Error"));
+ _error->Errno("write",_("Write error"));
Close();
return false;
}
diff -Nru apt-main/methods/http.cc apt-main.new/methods/http.cc
--- apt-main/methods/http.cc 2005-02-21 10:08:51.611408884 +0100
+++ apt-main.new/methods/http.cc 2005-02-21 10:07:49.039546801 +0100
@@ -514,14 +514,14 @@
{
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 @@
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 @@
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 @@
{
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 @@
// The header data is bad
case 2:
{
- _error->Error(_("Bad header Data"));
+ _error->Error(_("Bad header data"));
Fail(true);
RotateDNS();
continue;
diff -Nru apt-main/methods/rsh.cc apt-main.new/methods/rsh.cc
--- apt-main/methods/rsh.cc 2005-02-21 10:08:51.614408542 +0100
+++ apt-main.new/methods/rsh.cc 2005-02-21 10:07:49.116538019 +0100
@@ -229,7 +229,7 @@
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 @@
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 @@
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;
Attachment:
fixpo.sh
Description: application/shellscript