summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2006-04-26 10:49:28 +0200
committerMichael Vogt <egon@bottom>2006-04-26 10:49:28 +0200
commitce95a6f99ffa7bcb225bd9dd28dd73ee77553eb5 (patch)
treee922ee72e77d57e3b033dc4d7398567eda52f6db
parent2dafadd9d8b28dbe3d4a489764c67db90e70a29d (diff)
parent0e36721c09a1c7a77e9cf45bbbc8476d9ef5c60a (diff)
* merged with mainline
-rw-r--r--apt-pkg/deb/dpkgpm.cc4
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fe8fbca74..3b7b2238a 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -375,8 +375,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
},
// Purge operation
{
- {"config-files", _("Preparing for remove with config %s")},
- {"not-installed", _("Removed with config %s")},
+ {"config-files", _("Preparing to completely remove %s")},
+ {"not-installed", _("Completely removed %s")},
{NULL, NULL}
},
};
diff --git a/debian/changelog b/debian/changelog
index dccf4a99f..9a7ee7213 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ apt (0.6.43.4) unstable; urgency=low
* ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations
(thanks to Anthony Towns)
* apt pdiff support from experimental merged
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
* Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
* bg.po: Added, complete to 512t. Closes: #360262