diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2015-05-18 23:01:48 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2015-05-18 23:01:48 -0400 |
| commit | 55c0da38be611899ae6d185b72b5ffcadc9d78c9 (patch) | |
| tree | a124b64608601d9ac14e14c9ed56c3c1445da8aa | |
| parent | 0779f2ba2db6787259f3ea82f999e08552724218 (diff) | |
| download | postgresql-55c0da38be611899ae6d185b72b5ffcadc9d78c9.tar.gz postgresql-55c0da38be611899ae6d185b72b5ffcadc9d78c9.zip | |
Message string improvements
| -rw-r--r-- | src/bin/pg_basebackup/pg_receivexlog.c | 10 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/pg_recvlogical.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c index 53802af896b..71fb94578ed 100644 --- 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 index e4e16d7dc18..0bc141dd79b 100644 --- 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 index fee154904a6..0cc5e8d33db 100644 --- 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")); } } |