* scripts/dpkg-divert.pl (checkmanymodes): Change the error message to

	say 'commands' instead of 'modes'.
	* scripts/dpkg-statoverride.pl (CheckModeConflict): Likewise. Use
	gettext for the string.

diff --git a/ChangeLog b/ChangeLog
index 1335216d2afe0f2da7328fb890169933ee06e98a..cbd41fea13446062c599951ca9f7e706cf6a427a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-15  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-divert.pl (checkmanymodes): Change the error message to
+       say 'commands' instead of 'modes'.
+       * scripts/dpkg-statoverride.pl (CheckModeConflict): Likewise. Use
+       gettext for the string.
+
 2007-05-15  Guillem Jover  <guillem@debian.org>
 
        * utils/start-stop-daemon.c (daemonize): Use _exit instead of exit, to

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 2e22e2f5452c18b168fe058ddca44dee1b882f12..9e6661526f0b496cfef57df6f57e5d805451408d 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -75,7 +75,7 @@ my (@ssrc, @sdest);
 
 sub checkmanymodes {
     return unless $mode;
-    &badusage(sprintf(_g("two modes specified: %s and --%s"), $_, $mode));
+    badusage(sprintf(_g("two commands specified: %s and --%s"), $_, $mode));
 }
 
 while (@ARGV) {

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index 1f7fcd6d7387a953a1e39ebccf49acd16026c675..405a86ff259a2dc278db0a481fe1884c43d123da 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -59,7 +59,7 @@ Options:
 
 sub CheckModeConflict {
        return unless $mode;
-       &badusage("two modes specified: $_ and --$mode");
+       badusage(sprintf(_g("two commands specified: %s and --%s"), $_, $mode));
 }
 
 while (@ARGV) {