From: Guillem Jover <guillem@debian.org>
Date: Tue, 15 May 2007 12:56:33 +0000 (+0000)
Subject: 	* scripts/dpkg-divert.pl (checkmanymodes): Change the error message to
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3a2b6ec8965edb3009c559ca12a0ec3c62ed1bc;p=dpkg

	* 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 1335216d..cbd41fea 100644
--- 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 2e22e2f5..9e666152 100755
--- 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 1f7fcd6d..405a86ff 100755
--- 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) {