Message string improvements

petere · petere · commit 55c0da38be61 · 2015-05-18T23:01:48.000-04:00
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -479,17 +479,19 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (replication_slot == NULL && (do_drop_slot || do_create_slot))
+	if (do_drop_slot && do_create_slot)
 	{
-		fprintf(stderr, _("%s: --create-slot and --drop-slot need a slot to be specified using --slot\n"), progname);
+		fprintf(stderr, _("%s: cannot use --create-slot together with --drop-slot\n"), progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
 		exit(1);
 	}
 
-	if (do_drop_slot && do_create_slot)
+	if (replication_slot == NULL && (do_drop_slot || do_create_slot))
 	{
-		fprintf(stderr, _("%s: cannot use --create-slot together with --drop-slot\n"), progname);
+		/* translator: second %s is an option name */
+		fprintf(stderr, _("%s: %s needs a slot to be specified using --slot\n"), progname,
+				do_drop_slot ? "--drop-slot" : "--create-slot");
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
 		exit(1);
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -852,7 +852,7 @@ main(int argc, char **argv)
 	if (db_name == NULL)
 	{
 		fprintf(stderr,
-				_("%s: failed to establish database specific replication connection\n"),
+				_("%s: could not establish database-specific replication connection\n"),
 				progname);
 		disconnect_and_exit(1);
 	}
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
@@ -694,7 +694,7 @@ verify_peer_name_matches_certificate(PGconn *conn)
 		else
 		{
 			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("could not get server's hostname from server certificate\n"));
+							  libpq_gettext("could not get server's host name from server certificate\n"));
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -479,17 +479,19 @@ main(int argc, char **argv)`
`479`	`479`	`exit(1);`
`480`	`480`	`}`
`481`	`481`
`482`		`- if (replication_slot == NULL && (do_drop_slot \|\| do_create_slot))`
	`482`	`+ if (do_drop_slot && do_create_slot)`
`483`	`483`	`{`
`484`		`- fprintf(stderr, _("%s: --create-slot and --drop-slot need a slot to be specified using --slot\n"), progname);`
	`484`	`+ fprintf(stderr, _("%s: cannot use --create-slot together with --drop-slot\n"), progname);`
`485`	`485`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`486`	`486`	`progname);`
`487`	`487`	`exit(1);`
`488`	`488`	`}`
`489`	`489`
`490`		`- if (do_drop_slot && do_create_slot)`
	`490`	`+ if (replication_slot == NULL && (do_drop_slot \|\| do_create_slot))`
`491`	`491`	`{`
`492`		`- fprintf(stderr, _("%s: cannot use --create-slot together with --drop-slot\n"), progname);`
	`492`	`+ /* translator: second %s is an option name */`
	`493`	`+ fprintf(stderr, _("%s: %s needs a slot to be specified using --slot\n"), progname,`
	`494`	`+ do_drop_slot ? "--drop-slot" : "--create-slot");`
`493`	`495`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`494`	`496`	`progname);`
`495`	`497`	`exit(1);`
Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,7 @@ main(int argc, char **argv)`
`852`	`852`	`if (db_name == NULL)`
`853`	`853`	`{`
`854`	`854`	`fprintf(stderr,`
`855`		`- _("%s: failed to establish database specific replication connection\n"),`
	`855`	`+ _("%s: could not establish database-specific replication connection\n"),`
`856`	`856`	`progname);`
`857`	`857`	`disconnect_and_exit(1);`
`858`	`858`	`}`
Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ verify_peer_name_matches_certificate(PGconn *conn)`
`694`	`694`	`else`
`695`	`695`	`{`
`696`	`696`	`printfPQExpBuffer(&conn->errorMessage,`
`697`		`- libpq_gettext("could not get server's hostname from server certificate\n"));`
	`697`	`+ libpq_gettext("could not get server's host name from server certificate\n"));`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`