Merge lp:~evfool/apt/fix418552 into lp:~ubuntu-core-dev/apt/ubuntu

[Robert Roth]

Grammar fix for bug #418552.

[Michael Vogt (mvo)]

Thanks, merged.

review: Approve

=== modified file 'apt-pkg/algorithms.cc'
--- apt-pkg/algorithms.cc	2010-12-07 15:19:48 +0000
+++ apt-pkg/algorithms.cc	2011-02-05 13:42:58 +0000
@@ -1493,9 +1493,9 @@
    }
    
    if (TransientNetworkFailure == true)
-      _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+      _error->Warning(_("Some index files failed to download. They have been ignored, or old ones used instead."));
    else if (Failed == true)
-      return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+      return _error->Error(_("Some index files failed to download. They have been ignored, or old ones used instead."));
 
 
    // Run the success scripts if all was fine
 
=== modified file 'test/integration/test-bug-595691-empty-and-broken-archive-files'
--- test/integration/test-bug-595691-empty-and-broken-archive-files	2010-10-21 14:54:28 +0000
+++ test/integration/test-bug-595691-empty-and-broken-archive-files	2011-02-05 13:42:58 +0000
@@ -99,7 +99,7 @@
   Undetermined Error
 W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS)  Undetermined Error
 
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
 }
 
 testoverhttp() {
@@ -137,7 +137,7 @@
   Undetermined Error
 W: Failed to fetch http://localhost:8080/Packages.$COMPRESS  Undetermined Error
 
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
 }
 
 for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done