diff options
| -rw-r--r-- | src/bin/initdb/initdb.c | 8 | ||||
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 4 | ||||
| -rw-r--r-- | src/bin/scripts/common.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 15ac4b7cb2d..134c703c468 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -42,7 +42,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.140 2007/08/21 01:11:20 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.141 2007/09/25 16:29:34 petere Exp $ * *------------------------------------------------------------------------- */ @@ -2546,8 +2546,8 @@ usage(const char *progname) " in the respective category (default taken from\n" " environment)\n")); printf(_(" --no-locale equivalent to --locale=C\n")); - printf(_(" -T, --text-search-config=CFG\n")); - printf(_(" set default text search configuration\n")); + printf(_(" -T, --text-search-config=CFG\n" + " default text search configuration\n")); printf(_(" -X, --xlogdir=XLOGDIR location for the transaction log directory\n")); printf(_(" -A, --auth=METHOD default authentication method for local connections\n")); printf(_(" -U, --username=NAME database superuser name\n")); @@ -3036,7 +3036,7 @@ main(int argc, char *argv[]) } else if (strcmp(checkmatch, default_text_search_config) != 0) { - printf(_("%s: warning: specified text search configuration \"%s\" may not match locale \"%s\"\n"), + printf(_("%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"), progname, default_text_search_config, lc_ctype); } } diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 5b886d2492b..f298144d924 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.83 2007/07/12 18:15:52 mha Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.84 2007/09/25 16:29:34 petere Exp $ * *------------------------------------------------------------------------- */ @@ -535,7 +535,7 @@ unlimit_core_size(void) getrlimit(RLIMIT_CORE,&lim); if (lim.rlim_max == 0) { - write_stderr(_("%s: cannot set core size, disallowed by hard limit.\n"), + write_stderr(_("%s: cannot set core size, disallowed by hard limit\n"), progname); return; } diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index 6903fa6e033..93272b29c3b 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.27 2007/07/08 19:07:38 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.28 2007/09/25 16:29:34 petere Exp $ * *------------------------------------------------------------------------- */ @@ -349,7 +349,7 @@ handle_sigint(SIGNAL_ARGS) if (PQcancel(cancelConn, errbuf, sizeof(errbuf))) fprintf(stderr, _("Cancel request sent\n")); else - fprintf(stderr, _("Could not send cancel request: %s\n"), errbuf); + fprintf(stderr, _("Could not send cancel request: %s"), errbuf); } errno = save_errno; /* just in case the write changed it */ diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 43a183df394..69ec74c4c03 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.131 2007/07/24 09:00:27 mha Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.132 2007/09/25 16:29:34 petere Exp $ * *------------------------------------------------------------------------- */ @@ -464,7 +464,7 @@ pg_GSS_startup(PGconn *conn) if (conn->gctx) { printfPQExpBuffer(&conn->errorMessage, - libpq_gettext("duplicate GSS auth request\n")); + libpq_gettext("duplicate GSS authentication request\n")); return STATUS_ERROR; } @@ -666,7 +666,7 @@ pg_SSPI_startup(PGconn *conn, int use_negotiate) */ if (conn->pghost == NULL) { - printfPQExpBuffer(&conn->errorMessage, libpq_gettext("hostname must be specified\n")); + printfPQExpBuffer(&conn->errorMessage, libpq_gettext("host name must be specified\n")); return STATUS_ERROR; } conn->sspitarget = malloc(strlen(conn->krbsrvname)+strlen(conn->pghost)+2); |