Make new strings more alike previously existing messages.

alvherre · alvherre · commit d29a2ee3c073 · 2009-04-13T21:03:36.000Z
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.97 2009/04/05 04:19:58 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.98 2009/04/13 21:03:36 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -304,7 +304,7 @@ main(int argc, char **argv)
 	{
 		if (opts->filename)
 		{
-			fprintf(stderr, _("%s: cannot specify both -d and -f output\n"),
+			fprintf(stderr, _("%s: options -d/--dbname and -f/--file cannot be used together\n"),
 					progname);
 			fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 					progname);
@@ -316,7 +316,7 @@ main(int argc, char **argv)
 	/* Can't do single-txn mode with multiple connections */
 	if (opts->single_txn && opts->number_of_jobs > 1)
 	{
-		fprintf(stderr, _("%s: cannot specify both --single-transaction and multiple jobs\n"),
+		fprintf(stderr, _("%s: options -1/--single-transaction and -j/--jobs cannot be used together\n"),
 				progname);
 		exit(1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.97 2009/04/05 04:19:58 tgl Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.98 2009/04/13 21:03:36 alvherre Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -304,7 +304,7 @@ main(int argc, char **argv)`
`304`	`304`	`{`
`305`	`305`	`if (opts->filename)`
`306`	`306`	`{`
`307`		`- fprintf(stderr, _("%s: cannot specify both -d and -f output\n"),`
	`307`	`+ fprintf(stderr, _("%s: options -d/--dbname and -f/--file cannot be used together\n"),`
`308`	`308`	`progname);`
`309`	`309`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`310`	`310`	`progname);`
`@@ -316,7 +316,7 @@ main(int argc, char **argv)`
`316`	`316`	`/* Can't do single-txn mode with multiple connections */`
`317`	`317`	`if (opts->single_txn && opts->number_of_jobs > 1)`
`318`	`318`	`{`
`319`		`- fprintf(stderr, _("%s: cannot specify both --single-transaction and multiple jobs\n"),`
	`319`	`+ fprintf(stderr, _("%s: options -1/--single-transaction and -j/--jobs cannot be used together\n"),`
`320`	`320`	`progname);`
`321`	`321`	`exit(1);`
`322`	`322`	`}`