Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 588901d

Browse files
committed
Small string tweaks
1 parent e5b5739 commit 588901d

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/bin/initdb/initdb.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* Portions Copyright (c) 1994, Regents of the University of California
4343
* Portions taken from FreeBSD.
4444
*
45-
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.140 2007/08/21 01:11:20 tgl Exp $
45+
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.141 2007/09/25 16:29:34 petere Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -2546,8 +2546,8 @@ usage(const char *progname)
25462546
" in the respective category (default taken from\n"
25472547
" environment)\n"));
25482548
printf(_(" --no-locale equivalent to --locale=C\n"));
2549-
printf(_(" -T, --text-search-config=CFG\n"));
2550-
printf(_(" set default text search configuration\n"));
2549+
printf(_(" -T, --text-search-config=CFG\n"
2550+
" default text search configuration\n"));
25512551
printf(_(" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"));
25522552
printf(_(" -A, --auth=METHOD default authentication method for local connections\n"));
25532553
printf(_(" -U, --username=NAME database superuser name\n"));
@@ -3036,7 +3036,7 @@ main(int argc, char *argv[])
30363036
}
30373037
else if (strcmp(checkmatch, default_text_search_config) != 0)
30383038
{
3039-
printf(_("%s: warning: specified text search configuration \"%s\" may not match locale \"%s\"\n"),
3039+
printf(_("%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"),
30403040
progname, default_text_search_config, lc_ctype);
30413041
}
30423042
}

src/bin/pg_ctl/pg_ctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
66
*
7-
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.83 2007/07/12 18:15:52 mha Exp $
7+
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.84 2007/09/25 16:29:34 petere Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -535,7 +535,7 @@ unlimit_core_size(void)
535535
getrlimit(RLIMIT_CORE,&lim);
536536
if (lim.rlim_max == 0)
537537
{
538-
write_stderr(_("%s: cannot set core size, disallowed by hard limit.\n"),
538+
write_stderr(_("%s: cannot set core size, disallowed by hard limit\n"),
539539
progname);
540540
return;
541541
}

src/bin/scripts/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.27 2007/07/08 19:07:38 tgl Exp $
10+
* $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.28 2007/09/25 16:29:34 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -349,7 +349,7 @@ handle_sigint(SIGNAL_ARGS)
349349
if (PQcancel(cancelConn, errbuf, sizeof(errbuf)))
350350
fprintf(stderr, _("Cancel request sent\n"));
351351
else
352-
fprintf(stderr, _("Could not send cancel request: %s\n"), errbuf);
352+
fprintf(stderr, _("Could not send cancel request: %s"), errbuf);
353353
}
354354

355355
errno = save_errno; /* just in case the write changed it */

src/interfaces/libpq/fe-auth.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.131 2007/07/24 09:00:27 mha Exp $
10+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.132 2007/09/25 16:29:34 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -464,7 +464,7 @@ pg_GSS_startup(PGconn *conn)
464464
if (conn->gctx)
465465
{
466466
printfPQExpBuffer(&conn->errorMessage,
467-
libpq_gettext("duplicate GSS auth request\n"));
467+
libpq_gettext("duplicate GSS authentication request\n"));
468468
return STATUS_ERROR;
469469
}
470470

@@ -666,7 +666,7 @@ pg_SSPI_startup(PGconn *conn, int use_negotiate)
666666
*/
667667
if (conn->pghost == NULL)
668668
{
669-
printfPQExpBuffer(&conn->errorMessage, libpq_gettext("hostname must be specified\n"));
669+
printfPQExpBuffer(&conn->errorMessage, libpq_gettext("host name must be specified\n"));
670670
return STATUS_ERROR;
671671
}
672672
conn->sspitarget = malloc(strlen(conn->krbsrvname)+strlen(conn->pghost)+2);

0 commit comments

Comments
 (0)