From 329c8d5e149465003ea9007661a7af1099c75c43 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 10 Sep 2018 21:34:11 +0200 Subject: Reorder progress report messages We are seeing 'processing' messages from dpkg first, so it makes sense to translate them to "Preparing" messages instead of using "Installing" and co to override these shortly after with the "Preparing" messages. The difference isn't all to visible as later messages tend to linger far longer in the display than the ealier ones, but at least in a listing it seems more logical. --- apt-pkg/deb/dpkgpm.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'apt-pkg/deb/dpkgpm.cc') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index da2d5e3ae..f83b368cd 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -142,12 +142,12 @@ namespace // Maps the dpkg "processing" info to human readable names. Entry 0 // of each array is the key, entry 1 is the value. const std::pair PackageProcessingOps[] = { - std::make_pair("install", N_("Installing %s")), + std::make_pair("install", N_("Preparing %s")), // we don't care for the difference - std::make_pair("upgrade", N_("Installing %s")), - std::make_pair("configure", N_("Configuring %s")), - std::make_pair("remove", N_("Removing %s")), - std::make_pair("purge", N_("Completely removing %s")), + std::make_pair("upgrade", N_("Preparing %s")), + std::make_pair("configure", N_("Preparing to configure %s")), + std::make_pair("remove", N_("Preparing for removal of %s")), + std::make_pair("purge", N_("Preparing to completely remove %s")), std::make_pair("disappear", N_("Noting disappearance of %s")), std::make_pair("trigproc", N_("Running post-installation trigger %s")) }; @@ -1157,8 +1157,8 @@ void pkgDPkgPM::BuildPackagesProgressMap() static const std::array, 4> DpkgStatesOpMap = {{ // Install operation {{ - {"half-installed", N_("Preparing %s")}, - {"unpacked", N_("Unpacking %s") }, + {"half-installed", N_("Unpacking %s")}, + {"unpacked", N_("Installing %s") }, }}, // Configure operation {{ @@ -1167,12 +1167,12 @@ void pkgDPkgPM::BuildPackagesProgressMap() }}, // Remove operation {{ - {"half-configured", N_("Preparing for removal of %s")}, + {"half-configured", N_("Removing %s")}, {"half-installed", N_("Removing %s")}, }}, // Purge operation {{ - {"config-files", N_("Preparing to completely remove %s")}, + {"config-files", N_("Completely removing %s")}, {"not-installed", N_("Completely removed %s")}, }}, }}; -- cgit v1.2.3