* 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.

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

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) {

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) {