Fold some near-duplicate strings

13 files changed, 21 insertions, 16 deletions

diff --git a/NEWS b/NEWS
index 0a0a6b20..0ddadb52 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,8 @@ earlier releases.
   * [curses]: Adjust default widths of localized columns:
               broken_count, downloadsize (Closes: #674045)
 
+  * [all]: Fold some near-duplicate strings
+
 - Documentation:
 
   * [doc]: Add doctype headers to html docs.
diff --git a/src/cmdline/cmdline_changelog.cc b/src/cmdline/cmdline_changelog.cc
index a2ea9e92..17c79fca 100644
--- a/src/cmdline/cmdline_changelog.cc
+++ b/src/cmdline/cmdline_changelog.cc
@@ -143,7 +143,7 @@ void set_name(temp::name n, temp::name *target)
                   << std::string(term_metrics->get_screen_width(), ' ')
                   << "\r";
 
-      std::cout << _("Err ") << description << std::endl;
+      std::cout << _("Err") << " " << description << std::endl;
     }
   };
 
diff --git a/src/cmdline/cmdline_extract_cache_subset.cc b/src/cmdline/cmdline_extract_cache_subset.cc
index e13bd46b..2a2a3836 100644
--- a/src/cmdline/cmdline_extract_cache_subset.cc
+++ b/src/cmdline/cmdline_extract_cache_subset.cc
@@ -32,6 +32,7 @@
 #include <generic/apt/matching/match.h>
 #include <generic/apt/matching/parse.h>
 #include <generic/apt/matching/pattern.h>
+#include <generic/util/util.h>
 
 
 // System includes:
@@ -89,8 +90,8 @@ namespace aptitude
 		  pkgCache::PkgIterator pIt = (*apt_cache_file)->FindPkg(arg);
 		  if(pIt.end())
 		    {
-		      fprintf(stderr, _("No such package \"%s\".\n"),
-			      arg.c_str());
+                      std::cerr << ssprintf(_("No such package \"%s\""), arg.c_str())
+                                << std::endl;
 		      ok = false;
 		    }
 		  else
diff --git a/src/cmdline/cmdline_update.cc b/src/cmdline/cmdline_update.cc
index 2bfeaa51..e5035e38 100644
--- a/src/cmdline/cmdline_update.cc
+++ b/src/cmdline/cmdline_update.cc
@@ -41,7 +41,7 @@ using boost::shared_ptr;
 
 void print_autoclean_msg()
 {
-  printf(_("Deleting obsolete downloaded files\n"));
+  printf("%s\n", _("Deleting obsolete downloaded files"));
 }
 
 int cmdline_update(int argc, char *argv[], int verbose)
diff --git a/src/cmdline/cmdline_user_tag.cc b/src/cmdline/cmdline_user_tag.cc
index ba7a5810..e3cd7726 100644
--- a/src/cmdline/cmdline_user_tag.cc
+++ b/src/cmdline/cmdline_user_tag.cc
@@ -34,6 +34,7 @@
 #include <generic/apt/matching/match.h>
 #include <generic/apt/matching/parse.h>
 #include <generic/apt/matching/pattern.h>
+#include <generic/util/util.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -127,7 +128,8 @@ namespace aptitude
 	      if(pkg.end())
 		{
 		  if(quiet == 0)
-		    fprintf(stderr, _("No such package \"%s\".\n"), argv[i]);
+                    std::cerr << ssprintf(_("No such package \"%s\""), argv[i])
+                              << std::endl;
 		  all_ok = false;
 		}
 	      else
diff --git a/src/cmdline/cmdline_versions.cc b/src/cmdline/cmdline_versions.cc
index 8f57ff41..57e95d17 100644
--- a/src/cmdline/cmdline_versions.cc
+++ b/src/cmdline/cmdline_versions.cc
@@ -292,7 +292,7 @@ namespace
            (*pIt)->get_type() == m::pattern::exact_name)
           {
             return_value = 1;
-            _error->Error(_("No such package \"%s\"."),
+            _error->Error(_("No such package \"%s\""),
                           (*pIt)->get_exact_name_name().c_str());
           }
       }
diff --git a/src/generic/apt/download_update_manager.cc b/src/generic/apt/download_update_manager.cc
index b4b7a227..88a55f0d 100644
--- a/src/generic/apt/download_update_manager.cc
+++ b/src/generic/apt/download_update_manager.cc
@@ -127,7 +127,7 @@ void download_update_manager::finish(pkgAcquire::RunResult res,
       uri.User.clear();
       uri.Password.clear();
       const std::string descUri = string(uri);
-      _error->Warning(_("Failed to fetch %s: %s\n"), descUri.c_str(), (*it)->ErrorText.c_str());
+      _error->Warning(_("Failed to fetch %s: %s"), descUri.c_str(), (*it)->ErrorText.c_str());
 
       if((*it)->Status == pkgAcquire::Item::StatTransientNetworkError)
 	{
diff --git a/src/generic/apt/pkg_changelog.cc b/src/generic/apt/pkg_changelog.cc
index 8724d24c..9b1caf33 100644
--- a/src/generic/apt/pkg_changelog.cc
+++ b/src/generic/apt/pkg_changelog.cc
@@ -438,7 +438,7 @@ namespace aptitude
 	  const string source_version(info.get_source_version());
 	  const string section(info.get_section());
 	  const string name(info.get_display_name());
-	  const string short_description = cw::util::ssprintf(_("ChangeLog of %s"), name.c_str());
+	  const string short_description = cw::util::ssprintf(_("Changelog of %s"), name.c_str());
 
 	  try
 	    {
diff --git a/src/pkg_info_screen.cc b/src/pkg_info_screen.cc
index 32b558f9..52b65bbd 100644
--- a/src/pkg_info_screen.cc
+++ b/src/pkg_info_screen.cc
@@ -135,8 +135,8 @@ void pkg_grouppolicy_info::setup_package_info(const pkgCache::PkgIterator &pkg,
 				    _("Section: "),pkg.Section()?pkg.Section():_("Unknown"),
 				    _("Maintainer: "),rec.Maintainer().c_str(),
 				    _("Architecture: "),pkgCache::VerIterator(ver).Arch(),
-				    _("Compressed size: "), SizeToStr(ver->Size).c_str(),
-				    _("Uncompressed size: "), SizeToStr(ver->InstalledSize).c_str(),
+				    _("Compressed Size: "), SizeToStr(ver->Size).c_str(),
+				    _("Uncompressed Size: "), SizeToStr(ver->InstalledSize).c_str(),
 				    _("Source Package: "),
 				    rec.SourcePkg().empty()?pkg.Name():rec.SourcePkg().c_str())));
 
diff --git a/src/pkg_item.cc b/src/pkg_item.cc
index 8fe92917..e9d70dfc 100644
--- a/src/pkg_item.cc
+++ b/src/pkg_item.cc
@@ -407,7 +407,7 @@ bool pkg_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
 
 	      if(system(buf) != 0) { /* FIXME: ignore? */ }
 
-	      cerr<<_("Press return to continue.\n");
+	      cerr << _("Press Return to continue.") << endl;
 	      getchar();
 
 	      cw::toplevel::resume();
@@ -424,7 +424,7 @@ bool pkg_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
       e->set_package(package, visible_version());
 
       // FIXME: better title
-      add_main_widget(e, _("Hierarchy editor"), "", _("Hierarchy Editor"));
+      add_main_widget(e, _("Hierarchy Editor"), "", _("Hierarchy Editor"));
 
       e->connect_key("Quit", &cw::config::global_bindings,
 		     sigc::mem_fun(*e.unsafe_get_ref(), &cw::widget::destroy));
diff --git a/src/solution_fragment.cc b/src/solution_fragment.cc
index 8d8208bb..e0ed1798 100644
--- a/src/solution_fragment.cc
+++ b/src/solution_fragment.cc
@@ -510,7 +510,7 @@ cw::fragment *solution_fragment_with_ids(const aptitude_solution &sol,
   if(!unresolved.empty())
     {
       ids_column.append_newline();
-      fragments.push_back(cw::fragf(_("Leave the following dependencies unresolved:%n")));
+      fragments.push_back(cw::fragf("%s%n", _("Leave the following dependencies unresolved:")));
 
       for(std::vector<std::pair<pkgCache::DepIterator, choice> >::const_iterator i = unresolved.begin();
 	  i != unresolved.end(); ++i)
diff --git a/src/ui.cc b/src/ui.cc
index a94ed97d..b70b8cf7 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -1214,7 +1214,7 @@ namespace
     
     if(rval != pkgPackageManager::Incomplete)
       {
-	cerr << _("Press return to continue.\n");
+	cerr << _("Press Return to continue.") << endl;
 	int c = getchar();
 
 	while(c != '\n'  && c != EOF)
@@ -2306,7 +2306,7 @@ static void do_dump_resolver()
   static cw::editline::history_list history;
 
   if(resman != NULL && resman->resolver_exists())
-    prompt_string(_("File to which the resolver state should be dumped: "),
+    prompt_string(_("File to write resolver state to: "),
 		  "",
 		  cw::util::arg(sigc::ptr_fun(handle_dump_resolver_response)),
 		  NULL,
diff --git a/src/view_changelog.cc b/src/view_changelog.cc
index 8318a96f..ae7ed465 100644
--- a/src/view_changelog.cc
+++ b/src/view_changelog.cc
@@ -269,7 +269,7 @@ static void do_view_changelog(temp::name n,
 			      string curverstr)
 {
   string menulabel =
-    ssprintf(_("ChangeLog of %s"), pkgname.c_str());
+    ssprintf(_("Changelog of %s"), pkgname.c_str());
   string tablabel = ssprintf(_("%s changes"), pkgname.c_str());
   string desclabel = _("View the list of changes made to this Debian package.");